diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4755e1c..3160d60 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -43,12 +43,12 @@ build-splunk: &build-splunk
         name: Build Splunk
         command: |
           docker build --build-arg SPLUNK_VERSION=${SPLUNK} splunk \
-            -t docker.pkg.github.com/splunk/splunk-connect-for-syslog/stg-splunk-connect-for-syslog:splunk-${SYSLOG}-<< pipeline.id >>
+            -t docker.pkg.github.com/splunk/splunk-connect-for-syslog/stg-splunk-connect-for-syslog:splunk-${SPLUNK}-<< pipeline.id >>
     - run:
         name: Push Splunk
         command: |
           docker push \
-            docker.pkg.github.com/splunk/splunk-connect-for-syslog/stg-splunk-connect-for-syslog:splunk-${SYSLOG}-<< pipeline.id >>
+            docker.pkg.github.com/splunk/splunk-connect-for-syslog/stg-splunk-connect-for-syslog:splunk-${SPLUNK}-<< pipeline.id >>
 
 
 test: &test
@@ -69,9 +69,7 @@ test: &test
         name: test
         command: |
           pytest --splunk_type=docker --splunk_password=${SPLUNK_PASSWORD}
-        environment:
-          IMAGE_SC4S: docker.pkg.github.com/splunk/splunk-connect-for-syslog/stg-splunk-connect-for-syslog:sc4s-${SYSLOG}-<< pipeline.id >>
-          IMAGE_SPLUNK: docker.pkg.github.com/splunk/splunk-connect-for-syslog/stg-splunk-connect-for-syslog:splunk-${SYSLOG}-<< pipeline.id >>
+        no_output_timeout: 1h
 
 
 orbs:
diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
index f4fdca8..8bcfd30 100644
--- a/tests/docker-compose.yml
+++ b/tests/docker-compose.yml
@@ -12,7 +12,7 @@ version: "3.7"
 services:
 
   sc4s:
-    image: ${IMAGE_SC4S}
+    image: docker.pkg.github.com/splunk/splunk-connect-for-syslog/stg-splunk-connect-for-syslog:sc4s-${SYSLOG}-${CIRCLE_SHA1}
     #When this is enabled test_common will fail
     #    command: -det
     ports:
@@ -46,7 +46,7 @@ services:
     volumes:
       - ./tls:/opt/syslog-ng/tls
   splunk:
-    image: ${IMAGE_SPLUNK}
+    image: docker.pkg.github.com/splunk/splunk-connect-for-syslog/stg-splunk-connect-for-syslog:splunk-${SPLUNK}-${CIRCLE_SHA1}
 
     ports:
       - "8000"