diff --git a/ansible/delta-hosts/variables b/ansible/delta-hosts/variables
index 0dc676f8..cbcfbd51 100644
--- a/ansible/delta-hosts/variables
+++ b/ansible/delta-hosts/variables
@@ -145,9 +145,6 @@ aws_secret_access_key=GrOO85hfoc7+bwT2GjoWbLyzyNbOKb2/XOJbCJsv
 [starlord:vars]
 starlord_vault_token=319ff979-b066-87c7-1172-6f3b5305d749
 
-[swarm-manager:vars]
-environment_name=delta
-
 [user-vault:vars]
 user_vault_s3_access_key=AKIAJRB2ERCOLHGNYAFQ
 user_vault_s3_secret_key=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
diff --git a/ansible/gamma-hosts/variables b/ansible/gamma-hosts/variables
index 65bce5fa..c709f8a7 100644
--- a/ansible/gamma-hosts/variables
+++ b/ansible/gamma-hosts/variables
@@ -123,9 +123,6 @@ aws_secret_access_key=GrOO85hfoc7+bwT2GjoWbLyzyNbOKb2/XOJbCJsv
 [starlord:vars]
 starlord_vault_token=8d6b414a-2e6d-65fb-f0b8-c6200ae688ad
 
-[swarm-manager:vars]
-environment_name=gamma
-
 [user-vault:vars]
 user_vault_s3_access_key=AKIAIOTM4MKOJJVUL7IQ
 user_vault_s3_secret_key=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
diff --git a/ansible/group_vars/alpha-swarm-manager-metrics.yml b/ansible/group_vars/alpha-swarm-manager-metrics.yml
index f1b7b6ae..54723679 100644
--- a/ansible/group_vars/alpha-swarm-manager-metrics.yml
+++ b/ansible/group_vars/alpha-swarm-manager-metrics.yml
@@ -23,9 +23,9 @@ container_envs:
   - name: AWS_SECRET_KEY
     value: "{{ aws_secret_key }}"
   - name: DOCKER_CERT_PATH
-    value: "/opt/ssl/docker/swarm-manager"
+    value: "/etc/ssl/docker"
   - name: ENVIRONMENT
-    value: "{{ environment_name }}"
+    value: "{{ env }}"
   - name: SWARM_HOSTNAME
     value: "{{ swarm_host_address }}"
   - name: SWARM_PORT
diff --git a/ansible/k8/delta/swarm-cloudwatch-reporter/crons/swarm-cloudwatch-reporter b/ansible/k8/delta/swarm-cloudwatch-reporter/crons/swarm-cloudwatch-reporter
index e9c70de6..453a2676 100644
--- a/ansible/k8/delta/swarm-cloudwatch-reporter/crons/swarm-cloudwatch-reporter
+++ b/ansible/k8/delta/swarm-cloudwatch-reporter/crons/swarm-cloudwatch-reporter
@@ -20,7 +20,7 @@ spec:
               volumeMounts:
                 - name: swarm-cloudwatch-reporter-docker-ssl-certs
                   mountPath: /etc/ssl/docker
-              image: quay.io/runnable/furry-cactus:master
+              image: quay.io/runnable/furry-cactus:v2.0.0
               env:
                 - name: DATADOG_HOST
                   valueFrom:
@@ -33,7 +33,7 @@ spec:
                 - name: AWS_SECRET_KEY
                   value: "wgJ8gIKbe6dEpJxJHx8tnVWVWRMP8AhrLtOfWNsZ"
                 - name: DOCKER_CERT_PATH
-                  value: "/opt/ssl/docker/swarm-manager"
+                  value: "/etc/ssl/docker"
                 - name: ENVIRONMENT
                   value: "delta"
                 - name: SWARM_HOSTNAME
diff --git a/ansible/k8/gamma/swarm-cloudwatch-reporter/crons/swarm-cloudwatch-reporter b/ansible/k8/gamma/swarm-cloudwatch-reporter/crons/swarm-cloudwatch-reporter
index b7f91c13..aded69cb 100644
--- a/ansible/k8/gamma/swarm-cloudwatch-reporter/crons/swarm-cloudwatch-reporter
+++ b/ansible/k8/gamma/swarm-cloudwatch-reporter/crons/swarm-cloudwatch-reporter
@@ -33,7 +33,7 @@ spec:
                 - name: AWS_SECRET_KEY
                   value: "wgJ8gIKbe6dEpJxJHx8tnVWVWRMP8AhrLtOfWNsZ"
                 - name: DOCKER_CERT_PATH
-                  value: "/opt/ssl/docker/swarm-manager"
+                  value: "/etc/ssl/docker"
                 - name: ENVIRONMENT
                   value: "gamma"
                 - name: SWARM_HOSTNAME