diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b3858a45e3c393a075f8c1b849c63076225e1429..b2f5c1a2bca1b2ffb66e66de992f7dd6cd109d13 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,8 @@ build-img:
     entrypoint: [""]
   script:
     - mkdir -p /kaniko/.docker
-    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+    - DOCKER_AUTH=$(echo -n "$DOCKER_HUB_USR:$DOCKER_HUB_PASS" | base64)
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"},\"https://index.docker.io/v1/\":{\"auth\":\"$DOCKER_AUTH\"}}}" > /kaniko/.docker/config.json
     - /kaniko/executor --cache=true --context $CI_PROJECT_DIR --dockerfile ./Dockerfile --destination $CI_REGISTRY_IMAGE:latest
   tags:
     - docker
diff --git a/Dockerfile b/Dockerfile
index 1ef5f1d2c68fce891e8256a84897a8ae70d140e9..993fcdd35643ad941305d657a52835e3e2c14680 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # Docker Image for running csg-eb tests
 
-FROM public.ecr.aws/lts/ubuntu:20.04
+FROM ubuntu:20.04
 
 LABEL maintainer="Mark Meredith <mark.meredith@netl.doe.gov>"