diff --git a/Jenkinsfile b/Jenkinsfile
index 81ade99..4f12092 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,7 +6,8 @@ pipeline {
                 script: 'git describe --tags --exact-match 2>/dev/null || git symbolic-ref --short HEAD 2>/dev/null || git rev-parse --short HEAD'
             ).trim()}"""
         CONTAINER_REGISTRY = credentials('container_registry')
-        REPO_NAME = env.GIT_URL.replaceFirst(/^.*\/([^\/]+)\/([^\/]+?)\.git$/, '$1/$2')
+        REGISTRY_NAMESPACE = credentials('registry_namespace')
+        REPO_NAME = env.GIT_URL.replaceFirst(/^.*\/([^\/]+?).git$/, '$1')
     }
     stages {
         stage('Build') {
@@ -14,7 +15,7 @@ pipeline {
             steps {
                 sh "printenv"
                 sh "echo $REPO_NAME"
-                sh "podman build -t ${CONTAINER_REGISTRY}/${REPO_NAME}:${env.BRANCH_NAME} ."
+                sh "podman build -t ${CONTAINER_REGISTRY}/${REGISTRY_NAMESPACE}/${REPO_NAME}:${env.BRANCH_NAME} ."
             }
         }
         stage('Push') {
@@ -22,8 +23,8 @@ pipeline {
             steps {
                 withCredentials([usernamePassword(credentialsId: 'dockerhub', usernameVariable: 'REG_USERNAME', passwordVariable: 'REG_PASSWORD')]) {
                     sh '''
-                        podman login docker.io -u $REG_USERNAME -p $REG_PASSWORD
-                        podman push ${CONTAINER_REGISTRY}/${REPO_NAME}:${GIT_REF}
+                        podman login ${CONTAINER_REGISTRY -u ${REG_USERNAME} -p ${REG_PASSWORD}
+                        podman push ${CONTAINER_REGISTRY}/${REGISTRY_NAMESPACE}/${REPO_NAME}:${env.BRANCH_NAME}
                     '''
                 }
             }