diff --git a/scripts/Makefile.ci b/scripts/Makefile.ci
index 2a43d6b2..41539174 100644
--- a/scripts/Makefile.ci
+++ b/scripts/Makefile.ci
@@ -6,16 +6,16 @@ ci_build_static_binary: ## build static binary
 ci_build_dockerimage: ## build minimal docker image of optimizely
 	docker build \
 		-f scripts/dockerfiles/Dockerfile.static \
-		-t optimizely-docker.jfrog.io/optimizely:${APP_VERSION} \
-		-t optimizely-docker.jfrog.io/optimizely:latest \
+		-t optimizely/agent:${APP_VERSION} \
+		-t optimizely/agent:latest \
 		--build-arg GO_VERSION=${GIMME_GO_VERSION:.x=} \
 		.
 
 ci_build_dockerimage_alpine: ## build alpine docker image of optimizely
 	docker build \
 	  -f scripts/dockerfiles/Dockerfile.alpine \
-		-t optimizely-docker.jfrog.io/optimizely:${APP_VERSION}-alpine \
-		-t optimizely-docker.jfrog.io/optimizely:alpine \
+		-t optimizely/agent:${APP_VERSION}-alpine \
+		-t optimizely/agent:alpine \
 		--build-arg GO_VERSION=${GIMME_GO_VERSION:.x=} \
 		.
 
diff --git a/scripts/ci_upload_packages.sh b/scripts/ci_upload_packages.sh
index c330cdc9..e99ab438 100755
--- a/scripts/ci_upload_packages.sh
+++ b/scripts/ci_upload_packages.sh
@@ -6,16 +6,20 @@ cd /tmp/output_packages
 
 if [[ $TRAVIS_OS_NAME == "linux" ]]; then
   echo "we're on linux"
+
   for deb in `ls *.deb`; do
     curl -H "X-JFrog-Art-Api:${ARTIFACTORY_PASSWORD}" -XPUT "https://optimizely.jfrog.io/optimizely/deb-optimizely/pool/$deb;deb.distribution=xenial-optimizely;deb.distribution=bionic-optimizely;deb.component=main;deb.architecture=amd64" -T $deb
   done
+
   for rpm in `ls *.rpm`; do
     curl -H "X-JFrog-Art-Api:${ARTIFACTORY_PASSWORD}" -XPUT https://optimizely.jfrog.io/optimizely/rpm-optimizely/ -T $rpm
   done
-  # push docker images to artifactory
-  docker login -u ${ARTIFACTORY_USER} -p ${ARTIFACTORY_PASSWORD} optimizely-docker.jfrog.io
+
+  # push docker images to dockerhub
+  echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USER" --password-stdin
   # if you dont specify the tag, it'll push all image versions
-  docker push optimizely-docker.jfrog.io/optimizely
+  docker push optimizely/agent
+
 elif [[ $TRAVIS_OS_NAME == "osx" ]]; then
   echo "we're on osx"
 else