diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 058e6152f97ce960bf96fe70f197bfcab90866f6..b52dee66c9847230a66f32a5b416ac07f0d6b0ef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -630,7 +630,6 @@ deploy-image-caches:
   - sh -e ./generate-env.sh
   - rm environment
   - echo -en "${CBM206_PRIVATE_KEY}" > app/id_rsa
-  - ssh ${LOFAR_USER}@${LOFAR_TARGET} -p ${LOFAR_TARGET_PORT} 'mkdir -p ~/.lofar/tmss'
 
 .deploy-tmss-prod:
   stage: deploy-prod
@@ -638,7 +637,6 @@ deploy-image-caches:
     - *prepare_ssh
   after_script:
     - *prepare_ssh_agent
-    - ssh $LOFAR_USER@$LOFAR_TARGET -p ${LOFAR_TARGET_PORT} "cd .lofar/tmss; rm -rf lobster/.env; rm -rf lobster/env; tmss/.env; rm -rf tmss/env; rm -rf app/.env; rm -rf app/id_rsa"
   needs:
     - job: dockerize_TMSS
     - job: test_TMSS
diff --git a/SAS/TMSS/deploy/generate-env.sh b/SAS/TMSS/deploy/generate-env.sh
index 026ae3e59aacfea8b542e83fa3dcae9e07c56bc1..f4a135fa94cf23db3262ba319a9f9ed3d0cb820d 100755
--- a/SAS/TMSS/deploy/generate-env.sh
+++ b/SAS/TMSS/deploy/generate-env.sh
@@ -2,7 +2,6 @@
 
 # Base image for two-step docker-compose image generation
 echo "SOURCE_IMAGE=${SOURCE_IMAGE}" > tmss/.env
-echo "SOURCE_IMAGE=${SOURCE_IMAGE}" > lobster/.env
 
 echo "export LTA_HOST=${LTA_HOST}" > app/.env
 echo "export LTA_USER=${LTA_USER}" >> app/.env
@@ -32,7 +31,7 @@ echo "export TMSS_SLACK_PORT=${TMSS_SLACK_PORT}" >> app/.env
 echo "export TMSS_SLACK_DATABASE=${TMSS_SLACK_DATABASE}" >> app/.env
 
 # Environment variables required by processes in containers
-for folder in lobster tmss
+for folder in tmss
 do
   echo "LOFARENV=${LOFARENV}" > ${folder}/env
   # tmss django settings