diff --git a/.circleci/config.yml b/.circleci/config.yml
index b2884a2..65ac936 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -189,7 +189,9 @@ jobs:
       IMAGE_NAME: docker.pkg.github.com/splunk/splunk-connect-for-syslog/ci
       PUBLIC_IMAGE_NAME: docker.pkg.github.com/splunk/splunk-connect-for-syslog/releases
     docker:
-      - image: circleci/buildpack-deps:stretch
+      #- image: circleci/buildpack-deps:stretch
+      - image: circleci/golang:latest
+
     steps:
       - setup_remote_docker:
           docker_layer_caching: true
@@ -277,14 +279,12 @@ jobs:
       IMAGE_NAME: docker.pkg.github.com/splunk/splunk-connect-for-syslog/ci
       PUBLIC_IMAGE_NAME: docker.pkg.github.com/splunk/splunk-connect-for-syslog/releases
     docker:
-      - image: circleci/buildpack-deps:stretch
+      #- image: circleci/buildpack-deps:stretch
+      - image: circleci/golang:latest
     steps:
       - setup_remote_docker:
           docker_layer_caching: true
       - checkout
-      - run:
-          name: Create Directory
-          command: mkdir /tmp/artifacts
       - run:
           name: Create Directory
           command: mkdir /tmp/artifacts