diff --git a/docbuilder/Dockerfile b/docbuilder/Dockerfile
index c85ee55..fdd339a 100644
--- a/docbuilder/Dockerfile
+++ b/docbuilder/Dockerfile
@@ -1,17 +1,22 @@
-FROM ubuntu:bionic
-RUN apt-get update \
-  && apt-get install -y \
-       python-virtualenv \
-       python3-pip \
-       python3-dev \
-  && apt-get autoremove \
-  && apt-get clean
+FROM ubuntu:focal
+RUN : \
+    && apt-get update \
+    && apt install -y software-properties-common \
+    && add-apt-repository ppa:deadsnakes/ppa
+
+RUN : \
+    && apt-get update \
+    && apt-get install -y python3.7 python3-pip python3.7-venv make build-essential libssl-dev curl vim \
+    && apt-get autoremove \
+    && apt-get clean
 
 ENV VENV /venv
 
-RUN virtualenv -p python3.6 ${VENV} \
-    && ${VENV}/bin/pip install Sphinx \
-    && ${VENV}/bin/pip install sphinx_rtd_theme
+RUN python3.7 -m venv ${VENV} \
+    && ${VENV}/bin/pip3 install wheel
+RUN : \
+    && ${VENV}/bin/pip3 install Sphinx \
+    && ${VENV}/bin/pip3 install sphinx_rtd_theme
 
 # virtual env entrypoint
 COPY entrypoint.sh /opt
diff --git a/flytetester/Makefile b/flytetester/Makefile
index 0209d0a..9cc85f3 100644
--- a/flytetester/Makefile
+++ b/flytetester/Makefile
@@ -1,4 +1,4 @@
-export IMAGE_NAME=flytetester
+export IMAGE_NAME=flytetools
 VERSION=$(shell ./version.sh)
 PROJECT=flytetester
 DOMAIN=development
@@ -20,7 +20,7 @@ register_staging: docker_push
 	-e FLYTE_CREDENTIALS_CLIENT_SECRET=${FLYTE_CREDENTIALS_CLIENT_SECRET} \
 	-e FLYTE_CREDENTIALS_AUTH_MODE=basic -e FLYTE_CREDENTIALS_AUTHORIZATION_METADATA_KEY=flyte-authorization \
 	-e FLYTE_CREDENTIALS_SCOPE=svc -e FLYTE_PLATFORM_AUTH=True \
-	docker.io/lyft/${IMAGE_NAME}:${VERSION} /usr/local/bin/flytekit_venv make register_staging_in_container
+	ghcr.io/nuclyde-io/${IMAGE_NAME}:${VERSION} /usr/local/bin/flytekit_venv make register_staging_in_container
 
 .PHONY: register_production_in_container
 register_production_in_container:
@@ -32,7 +32,7 @@ register_production: docker_push
 	-e FLYTE_CREDENTIALS_CLIENT_SECRET=${FLYTE_CREDENTIALS_CLIENT_SECRET} \
 	-e FLYTE_CREDENTIALS_AUTH_MODE=basic -e FLYTE_CREDENTIALS_AUTHORIZATION_METADATA_KEY=flyte-authorization \
 	-e FLYTE_CREDENTIALS_SCOPE=svc -e FLYTE_PLATFORM_AUTH=True \
-	docker.io/lyft/${IMAGE_NAME}:${VERSION} /usr/local/bin/flytekit_venv make register_production_in_container
+	ghcr.io/nuclyde-io/${IMAGE_NAME}:${VERSION} /usr/local/bin/flytekit_venv make register_production_in_container
 
 .PHONY: register_production_in_container
 register_sandbox_in_container:
@@ -40,7 +40,7 @@ register_sandbox_in_container:
 
 .PHONY: register_production
 register_sandbox: docker_push
-	docker run docker.io/lyft/${IMAGE_NAME}:${VERSION} /usr/local/bin/flytekit_venv make register_sandbox_in_container
+	docker run ghcr.io/nuclyde-io/${IMAGE_NAME}:${VERSION} /usr/local/bin/flytekit_venv make register_sandbox_in_container
 
 .PHONY: end2end
 end2end_test:
@@ -52,7 +52,7 @@ docker_build:
 
 .PHONY: docker_push
 docker_push:
-	REGISTRY=docker.io/lyft scripts/docker_build.sh
+	REGISTRY=ghcr.io/nuclyde-io scripts/docker_build.sh
 
 .PHONY: docker_build_push
 docker_build_push:
diff --git a/flytetester/end2end/run.sh b/flytetester/end2end/run.sh
index 0dac75e..786c4b5 100755
--- a/flytetester/end2end/run.sh
+++ b/flytetester/end2end/run.sh
@@ -9,14 +9,14 @@ flytekit_venv flyte-cli -h flyteadmin:81 --insecure register-project -n flytetes
 # Currently, kill the admin pod, so that the init container sync picks up the change.
 
 # First register everything, but make sure to use local Dockernetes admin
-flytekit_venv pyflyte -p flytetester -d development -c end2end/end2end.config register workflows
+flytekit_venv pyflyte -c end2end/end2end.config register -p flytetester -d development workflows
 
 # Kick off workflows
-flytekit_venv pyflyte -p flytetester -d development -c end2end/end2end.config lp execute app.workflows.work.WorkflowWithIO --b hello_world
-flytekit_venv pyflyte -p flytetester -d development -c end2end/end2end.config lp execute app.workflows.failing_workflows.DivideByZeroWf
-flytekit_venv pyflyte -p flytetester -d development -c end2end/end2end.config lp execute app.workflows.failing_workflows.RetrysWf
-flytekit_venv pyflyte -p flytetester -d development -c end2end/end2end.config lp execute app.workflows.failing_workflows.FailingDynamicNodeWF
-flytekit_venv pyflyte -p flytetester -d development -c end2end/end2end.config lp execute app.workflows.failing_workflows.RunToCompletionWF
+flytekit_venv pyflyte -c end2end/end2end.config lp -p flytetester -d development execute app.workflows.work.WorkflowWithIO --b hello_world
+flytekit_venv pyflyte -c end2end/end2end.config lp -p flytetester -d development execute app.workflows.failing_workflows.DivideByZeroWf
+flytekit_venv pyflyte -c end2end/end2end.config lp -p flytetester -d development execute app.workflows.failing_workflows.RetrysWf
+flytekit_venv pyflyte -c end2end/end2end.config lp -p flytetester -d development execute app.workflows.failing_workflows.FailingDynamicNodeWF
+flytekit_venv pyflyte -c end2end/end2end.config lp -p flytetester -d development execute app.workflows.failing_workflows.RunToCompletionWF
 
 # Make sure workflow does everything correctly
 flytekit_venv python end2end/validator.py
diff --git a/flytetester/requirements.txt b/flytetester/requirements.txt
index fd7e8c7..5a496bc 100644
--- a/flytetester/requirements.txt
+++ b/flytetester/requirements.txt
@@ -1,4 +1,4 @@
-flytekit[sidecar,schema]==0.16.0a0
+flytekit[sidecar,schema]==0.16.0a2
 statsd
 opencv-python
 k8s-proto>=0.0.2