diff --git a/backend/Dockerfile b/backend/Dockerfile
index f09fe3b3..8c7381ed 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -15,8 +15,10 @@ ADD ./app_sdk/app_base.py /app_sdk
 ADD ./app_gen /app_gen
 
 RUN go get -v
+RUN go mod tidy
+RUN go clean -modcache
 
-RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o webapp .
+RUN CGO_ENABLED=1 GOOS=linux go build -a -installsuffix cgo -o webapp .
 
 # Certificate build - gets required certs
 FROM alpine:latest as certs
diff --git a/backend/go-app/go.mod b/backend/go-app/go.mod
index da336df1..0a3505d6 100644
--- a/backend/go-app/go.mod
+++ b/backend/go-app/go.mod
@@ -1,16 +1,16 @@
 module shuffle
 
-go 1.19
+go 1.16
 
 //replace github.com/shuffle/shuffle-shared => ../../../shuffle-shared
 
 require (
 	cloud.google.com/go/datastore v1.10.0
-	cloud.google.com/go/pubsub v1.27.1
+	cloud.google.com/go/pubsub v1.28.0
 	cloud.google.com/go/storage v1.28.1
 	github.com/basgys/goxml2json v1.1.0
 	github.com/carlescere/scheduler v0.0.0-20170109141437-ee74d2f83d82
-	github.com/docker/docker v20.10.19+incompatible
+	github.com/docker/docker v20.10.21+incompatible
 	github.com/frikky/kin-openapi v0.42.0
 	github.com/fsouza/go-dockerclient v1.9.0
 	github.com/ghodss/yaml v1.0.0
@@ -27,74 +27,3 @@ require (
 	gopkg.in/src-d/go-git.v4 v4.13.1
 	gopkg.in/yaml.v3 v3.0.1
 )
-
-require (
-	cloud.google.com/go v0.105.0 // indirect
-	cloud.google.com/go/compute v1.12.1 // indirect
-	cloud.google.com/go/compute/metadata v0.2.1 // indirect
-	cloud.google.com/go/iam v0.7.0 // indirect
-	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
-	github.com/Masterminds/semver v1.5.0 // indirect
-	github.com/Microsoft/go-winio v0.6.0 // indirect
-	github.com/Microsoft/hcsshim v0.9.3 // indirect
-	github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 // indirect
-	github.com/acomagu/bufpipe v1.0.3 // indirect
-	github.com/adrg/strutil v0.3.0 // indirect
-	github.com/algolia/algoliasearch-client-go/v3 v3.26.1 // indirect
-	github.com/bradfitz/gomemcache v0.0.0-20221031212613-62deef7fc822 // indirect
-	github.com/bradfitz/slice v0.0.0-20180809154707-2b758aa73013 // indirect
-	github.com/cloudflare/circl v1.1.0 // indirect
-	github.com/containerd/cgroups v1.0.3 // indirect
-	github.com/containerd/containerd v1.6.6 // indirect
-	github.com/docker/distribution v2.8.1+incompatible // indirect
-	github.com/docker/go-connections v0.4.0 // indirect
-	github.com/docker/go-units v0.5.0 // indirect
-	github.com/emirpasic/gods v1.18.1 // indirect
-	github.com/frikky/go-elasticsearch/v8 v8.13.1 // indirect
-	github.com/go-git/gcfg v1.5.0 // indirect
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/swag v0.19.5 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
-	github.com/google/go-github/v28 v28.1.1 // indirect
-	github.com/google/go-querystring v1.1.0 // indirect
-	github.com/google/uuid v1.3.0 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
-	github.com/googleapis/gax-go/v2 v2.7.0 // indirect
-	github.com/imdario/mergo v0.3.13 // indirect
-	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
-	github.com/kevinburke/ssh_config v1.2.0 // indirect
-	github.com/mailru/easyjson v0.7.0 // indirect
-	github.com/moby/sys/mount v0.3.3 // indirect
-	github.com/moby/sys/mountinfo v0.6.2 // indirect
-	github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
-	github.com/morikuni/aec v1.0.0 // indirect
-	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
-	github.com/opencontainers/runc v1.1.2 // indirect
-	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
-	github.com/pjbgf/sha1cd v0.2.0 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/sergi/go-diff v1.1.0 // indirect
-	github.com/sirupsen/logrus v1.8.1 // indirect
-	github.com/skeema/knownhosts v1.1.0 // indirect
-	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
-	github.com/src-d/gcfg v1.4.0 // indirect
-	github.com/xanzy/ssh-agent v0.3.2 // indirect
-	go.opencensus.io v0.24.0 // indirect
-	go4.org v0.0.0-20201209231011-d4a079459e60 // indirect
-	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
-	golang.org/x/net v0.2.0 // indirect
-	golang.org/x/oauth2 v0.2.0 // indirect
-	golang.org/x/sync v0.1.0 // indirect
-	golang.org/x/sys v0.2.0 // indirect
-	golang.org/x/text v0.4.0 // indirect
-	golang.org/x/tools v0.1.12 // indirect
-	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
-	google.golang.org/genproto v0.0.0-20221201164419-0e50fba7f41c // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
-	gopkg.in/warnings.v0 v0.1.2 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-)
diff --git a/docker-compose.yml b/docker-compose.yml
index cf4e3b47..c4eb10ef 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,65 +1,65 @@
 version: '3'
 services:
-  #frontend:
-  #  #build: ./frontend
-  #  image: ghcr.io/shuffle/shuffle-frontend:nightly
-  #  container_name: shuffle-frontend
-  #  hostname: shuffle-frontend
-  #  ports:
-  #    - "${FRONTEND_PORT}:80"
-  #    - "${FRONTEND_PORT_HTTPS}:443"
-  #  networks:
-  #    - shuffle
-  #  environment:
-  #    - BACKEND_HOSTNAME=${BACKEND_HOSTNAME}
-  #  restart: unless-stopped
-  #  depends_on:
-  #    - backend
-  #backend:
-  #  #build: ./backend
-  #  image: ghcr.io/shuffle/shuffle-backend:nightly
-  #  container_name: shuffle-backend
-  #  hostname: ${BACKEND_HOSTNAME}
-  #  # Here for debugging:
-  #  ports:
-  #    - "${BACKEND_PORT}:5001"
-  #  networks:
-  #    - shuffle
-  #  volumes:
-  #    - /var/run/docker.sock:/var/run/docker.sock
-  #    - ${SHUFFLE_APP_HOTLOAD_LOCATION}:/shuffle-apps:z
-  #    - ${SHUFFLE_FILE_LOCATION}:/shuffle-files:z
-  #    #- ${SHUFFLE_OPENSEARCH_CERTIFICATE_FILE}:/shuffle-files/es_certificate
-  #  env_file: .env
-  #  environment:
-  #    #- DOCKER_HOST=tcp://docker-socket-proxy:2375
-  #    - SHUFFLE_APP_HOTLOAD_FOLDER=/shuffle-apps
-  #    - SHUFFLE_FILE_LOCATION=/shuffle-files
-  #  restart: unless-stopped
-  #orborus:
-  #  image: ghcr.io/shuffle/shuffle-orborus:nightly
-  #  container_name: shuffle-orborus
-  #  hostname: shuffle-orborus
-  #  networks:
-  #    - shuffle
-  #  volumes:
-  #    - /var/run/docker.sock:/var/run/docker.sock
-  #  environment:
-  #    #- DOCKER_HOST=tcp://docker-socket-proxy:2375
-  #    - SHUFFLE_WORKER_VERSION=latest
-  #    - ENVIRONMENT_NAME=${ENVIRONMENT_NAME}
-  #    - BASE_URL=http://${OUTER_HOSTNAME}:5001
-  #    - DOCKER_API_VERSION=1.40
-  #    - SHUFFLE_BASE_IMAGE_NAME=${SHUFFLE_BASE_IMAGE_NAME}
-  #    - SHUFFLE_BASE_IMAGE_REGISTRY=${SHUFFLE_BASE_IMAGE_REGISTRY}
-  #    - SHUFFLE_BASE_IMAGE_TAG_SUFFIX=${SHUFFLE_BASE_IMAGE_TAG_SUFFIX}
-  #    - HTTP_PROXY=${HTTP_PROXY}
-  #    - HTTPS_PROXY=${HTTPS_PROXY}:qa
-  #    - SHUFFLE_PASS_WORKER_PROXY=${SHUFFLE_PASS_WORKER_PROXY}
-  #    - SHUFFLE_PASS_APP_PROXY=${SHUFFLE_PASS_APP_PROXY}
-  #  restart: unless-stopped
-  #  security_opt:
-  #    - seccomp:unconfined
+  frontend:
+    #build: ./frontend
+    image: ghcr.io/shuffle/shuffle-frontend:nightly
+    container_name: shuffle-frontend
+    hostname: shuffle-frontend
+    ports:
+      - "${FRONTEND_PORT}:80"
+      - "${FRONTEND_PORT_HTTPS}:443"
+    networks:
+      - shuffle
+    environment:
+      - BACKEND_HOSTNAME=${BACKEND_HOSTNAME}
+    restart: unless-stopped
+    depends_on:
+      - backend
+  backend:
+    build: ./backend
+    image: ghcr.io/shuffle/shuffle-backend:nightly
+    container_name: shuffle-backend
+    hostname: ${BACKEND_HOSTNAME}
+    # Here for debugging:
+    ports:
+      - "${BACKEND_PORT}:5001"
+    networks:
+      - shuffle
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - ${SHUFFLE_APP_HOTLOAD_LOCATION}:/shuffle-apps:z
+      - ${SHUFFLE_FILE_LOCATION}:/shuffle-files:z
+      #- ${SHUFFLE_OPENSEARCH_CERTIFICATE_FILE}:/shuffle-files/es_certificate
+    env_file: .env
+    environment:
+      #- DOCKER_HOST=tcp://docker-socket-proxy:2375
+      - SHUFFLE_APP_HOTLOAD_FOLDER=/shuffle-apps
+      - SHUFFLE_FILE_LOCATION=/shuffle-files
+    restart: unless-stopped
+  orborus:
+    image: ghcr.io/shuffle/shuffle-orborus:nightly
+    container_name: shuffle-orborus
+    hostname: shuffle-orborus
+    networks:
+      - shuffle
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    environment:
+      #- DOCKER_HOST=tcp://docker-socket-proxy:2375
+      - SHUFFLE_WORKER_VERSION=latest
+      - ENVIRONMENT_NAME=${ENVIRONMENT_NAME}
+      - BASE_URL=http://${OUTER_HOSTNAME}:5001
+      - DOCKER_API_VERSION=1.40
+      - SHUFFLE_BASE_IMAGE_NAME=${SHUFFLE_BASE_IMAGE_NAME}
+      - SHUFFLE_BASE_IMAGE_REGISTRY=${SHUFFLE_BASE_IMAGE_REGISTRY}
+      - SHUFFLE_BASE_IMAGE_TAG_SUFFIX=${SHUFFLE_BASE_IMAGE_TAG_SUFFIX}
+      - HTTP_PROXY=${HTTP_PROXY}
+      - HTTPS_PROXY=${HTTPS_PROXY}
+      - SHUFFLE_PASS_WORKER_PROXY=${SHUFFLE_PASS_WORKER_PROXY}
+      - SHUFFLE_PASS_APP_PROXY=${SHUFFLE_PASS_APP_PROXY}
+    restart: unless-stopped
+    security_opt:
+      - seccomp:unconfined
   opensearch:
     image: opensearchproject/opensearch:2.4.0
     hostname: shuffle-opensearch