diff --git a/.ebextensions/enable-websockets.config b/.ebextensions/enable-websockets.config
deleted file mode 100644
index 71bd64e9..00000000
--- a/.ebextensions/enable-websockets.config
+++ /dev/null
@@ -1,7 +0,0 @@
-container_commands:
-  enable_websockets:
-    command: |
-      sed -i '/\s*proxy_set_header\s*Connection/c \
-              proxy_set_header Upgrade $http_upgrade;\
-              proxy_set_header Connection "upgrade";\
-              ' /tmp/deployment/config/#etc#nginx#conf.d#00_elastic_beanstalk_proxy.conf
\ No newline at end of file
diff --git a/80/jade-service-runner-manifest.json b/80/jade-service-runner-manifest.json
new file mode 100644
index 00000000..e7fd950d
--- /dev/null
+++ b/80/jade-service-runner-manifest.json
@@ -0,0 +1,4 @@
+{
+  "version": "0.0.1",
+  "lastModified": "2019-08-20T06:46:22.630Z"
+}
\ No newline at end of file
diff --git a/cfn/init-base.sh b/cfn/init-base.sh
index ae6c2c58..2b10071b 100755
--- a/cfn/init-base.sh
+++ b/cfn/init-base.sh
@@ -9,5 +9,5 @@ aws cloudformation create-stack \
     --region us-west-2 || true
 
 aws cloudformation wait stack-create-complete \
-    --stack-name jade-service-runner-base--stack \
+    --stack-name jade-service-runner-base-stack \
     --region us-west-2 || true
diff --git a/cfn/jade-service-runner.cfn.json b/cfn/jade-service-runner.cfn.json
index 543c6016..ac8f9ba9 100644
--- a/cfn/jade-service-runner.cfn.json
+++ b/cfn/jade-service-runner.cfn.json
@@ -155,19 +155,44 @@
           },
           {
             "Namespace": "aws:elb:loadbalancer",
-            "OptionName": "LoadBalancerHTTPPort",
-            "Value": 80
+            "OptionName": "SSLCertificateId",
+            "Value": { "Ref": "AutoCertificate" }
           },
           {
-            "Namespace": "aws:elb:loadbalancer",
-            "OptionName": "LoadBalancerHTTPSPort",
-            "Value": 443
+            "Namespace": "aws:elb:listener:443",
+            "OptionName": "InstancePort",
+            "Value": 8081
           },
           {
-            "Namespace": "aws:elb:loadbalancer",
+            "Namespace": "aws:elb:listener:443",
+            "OptionName": "InstanceProtocol",
+            "Value": "HTTP"
+          },
+          {
+            "Namespace": "aws:elb:listener:443",
+            "OptionName": "ListenerProtocol",
+            "Value": "HTTPS"
+          },
+          {
+            "Namespace": "aws:elb:listener:443",
             "OptionName": "SSLCertificateId",
             "Value": { "Ref": "AutoCertificate" }
           },
+          {
+            "Namespace": "aws:elb:listener:80",
+            "OptionName": "InstancePort",
+            "Value": 8081
+          },
+          {
+            "Namespace": "aws:elb:listener:80",
+            "OptionName": "InstanceProtocol",
+            "Value": "HTTP"
+          },
+          {
+            "Namespace": "aws:elb:listener:80",
+            "OptionName": "ListenerProtocol",
+            "Value": "HTTP"
+          },
           {
             "Namespace": "aws:elasticbeanstalk:container:nodejs",
             "OptionName": "NodeCommand",
@@ -176,7 +201,7 @@
           {
             "Namespace": "aws:elasticbeanstalk:container:nodejs",
             "OptionName": "ProxyServer",
-            "Value": "None"
+            "Value": "none"
           }
         ]
       }
diff --git a/package.json b/package.json
index 1be63350..db700f2d 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "build:semiclean": "rm -rf build/generated-client/rust",
     "build:integration": "webpack --config fixtures/webpack.config.js",
     "build:docs": "typedoc",
-    "startaws": "npm run build:code && node build/src/cli/index.js -p 80",
+    "startaws": "npm run build:code && node build/src/cli/index.js -p 8081",
     "start": "npm run build:code && node build/src/cli/index.js -d $PORT",
     "start:client": "node build/client.js",
     "test": "npm run test:lint && npm run test:unit",