diff --git a/dual-master/cf-service-lb.yml b/dual-master/cf-service-lb.yml
index d641851..39882ff 100644
--- a/dual-master/cf-service-lb.yml
+++ b/dual-master/cf-service-lb.yml
@@ -83,6 +83,7 @@
         Type: AWS::ECS::Service
         DependsOn:
           - HTTPListener
+          - SSHListener
         Properties:
             Cluster:
               Fn::ImportValue:
@@ -93,6 +94,9 @@
                 - ContainerName: !Ref LBServiceName
                   ContainerPort: !Ref HTTPContainerPort
                   TargetGroupArn: !Ref HTTPTargetGroup
+                - ContainerName: !Ref LBServiceName
+                  ContainerPort: !Ref SSHGerritPort
+                  TargetGroupArn: !Ref SSHTargetGroup
 
     TaskDefinition:
         Type: AWS::ECS::TaskDefinition
@@ -120,6 +124,9 @@
                     - ContainerPort: !Ref HTTPContainerPort
                       HostPort: !Ref HTTPHostPort
                       Protocol: tcp
+                    - ContainerPort: !Ref SSHGerritPort
+                      HostPort: !Ref SSHGerritPort
+                      Protocol: tcp
                   Links:
                     - !Ref SyslogSidecarServiceName
                   LogConfiguration:
@@ -181,6 +188,27 @@
             Port: !Ref HTTPSHostPort
             Protocol: TLS
 
+    SSHTargetGroup:
+        Type: AWS::ElasticLoadBalancingV2::TargetGroup
+        DependsOn: LoadBalancer
+        Properties:
+            VpcId:
+              Fn::ImportValue:
+                  !Join [':', [!Ref 'ClusterStackName', 'VPCId']]
+            Port: !Ref SSHGerritPort
+            Protocol: TCP
+
+    SSHListener:
+        Type: AWS::ElasticLoadBalancingV2::Listener
+        DependsOn: LoadBalancer
+        Properties:
+            DefaultActions:
+            - Type: forward
+              TargetGroupArn: !Ref SSHTargetGroup
+            LoadBalancerArn: !Ref LoadBalancer
+            Port: !Ref SSHGerritPort
+            Protocol: TCP
+
 Outputs:
   PublicLoadBalancerDNSName:
     Description: The DNS name of the external load balancer