diff --git a/.jenkins/Jenkinsfile b/.jenkins/Jenkinsfile
index 25d98f3..ecfdf5d 100644
--- a/.jenkins/Jenkinsfile
+++ b/.jenkins/Jenkinsfile
@@ -22,7 +22,7 @@ pipeline {
 					steps {
 						script {
 							env.BASE_TAG         = 'latest'
-							env.BUILDX_PUSH_TAGS = "-t docker.io/nginxproxymanager/${IMAGE}:${BASE_TAG}"
+							env.BUILDX_PUSH_TAGS = "-t docker.io/jc21/${IMAGE}:${BASE_TAG}"
 						}
 					}
 				}
@@ -36,7 +36,7 @@ pipeline {
 						script {
 							// Defaults to the Branch name, which is applies to all branches AND pr's
 							env.BASE_TAG         = "github-${BRANCH_LOWER}"
-							env.BUILDX_PUSH_TAGS = "-t docker.io/nginxproxymanager/${IMAGE}:${BASE_TAG}"
+							env.BUILDX_PUSH_TAGS = "-t docker.io/jc21/${IMAGE}:${BASE_TAG}"
 						}
 					}
 				}
@@ -64,9 +64,9 @@ pipeline {
 			}
 			steps {
 				script {
-					def comment = pullRequest.comment("""Docker Image for build ${BUILD_NUMBER} is available on [DockerHub](https://cloud.docker.com/repository/docker/nginxproxymanager/${IMAGE}) as:
+					def comment = pullRequest.comment("""Docker Image for build ${BUILD_NUMBER} is available on [DockerHub](https://cloud.docker.com/repository/docker/jc21/${IMAGE}) as:
 
-- `nginxproxymanager/${IMAGE}:github-${BRANCH_LOWER}`
+- `jc21/${IMAGE}:github-${BRANCH_LOWER}`
 """)
 				}
 			}
diff --git a/README.md b/README.md
index 33d5b4f..c12cc89 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,11 @@
 # testca
 
 <p>
-  <a href="https://hub.docker.com/repository/docker/nginxproxymanager/testca">
-    <img src="https://img.shields.io/docker/stars/nginxproxymanager/testca.svg?style=for-the-badge">
+  <a href="https://hub.docker.com/repository/docker/jc21/testca">
+    <img src="https://img.shields.io/docker/stars/jc21/testca.svg?style=for-the-badge">
   </a>
-  <a href="https://hub.docker.com/repository/docker/nginxproxymanager/testca">
-    <img src="https://img.shields.io/docker/pulls/nginxproxymanager/testca.svg?style=for-the-badge">
-  </a>
-  <a href="https://ci.nginxproxymanager.com/blue/organizations/jenkins/docker-testca/branches/">
-    <img src="https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fci.nginxproxymanager.com%2Fjob%2Fdocker-testca%2Fjob%2Fmaster&style=for-the-badge">
+  <a href="https://hub.docker.com/repository/docker/jc21/testca">
+    <img src="https://img.shields.io/docker/pulls/jc21/testca.svg?style=for-the-badge">
   </a>
 </p>
 
@@ -22,7 +19,7 @@ docker-compose.yml:
 version: "3"
 services:
   testca:
-    image: nginxproxymanager/testca
+    image: jc21/testca
     networks:
       default:
         aliases:
@@ -35,7 +32,7 @@ in your system before you will be able to trust this CA.
 You can also install this as part of a Dockerfile:
 
 ```
-FROM nginxproxymanager/testca as testca
+FROM jc21/testca as testca
 FROM alpine
 
 COPY --from=testca /home/step/certs/root_ca.crt /etc/ssl/NginxProxyManager.crt
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 0e92b39..276bd51 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -22,4 +22,4 @@ LABEL org.label-schema.schema-version="1.0" \
 	org.label-schema.description="A ready-to-go Certificate Authority for testing" \
 	org.label-schema.url="https://github.com/nginxproxymanager/docker-testca" \
 	org.label-schema.vcs-url="https://github.com/nginxproxymanager/docker-testca.git" \
-	org.label-schema.cmd="docker run --rm -ti nginxproxymanager/testca:latest"
+	org.label-schema.cmd="docker run --rm -ti jc21/testca:latest"
diff --git a/scripts/buildx b/scripts/buildx
old mode 100755
new mode 100644