diff --git a/roles/xos-build/defaults/main.yml b/roles/xos-build/defaults/main.yml
index 3d67ba2..4467e45 100644
--- a/roles/xos-build/defaults/main.yml
+++ b/roles/xos-build/defaults/main.yml
@@ -1,4 +1,3 @@
 ---
 
 xos_repo_dir: "{{ playbook_dir }}/../../orchestration/xos/containers/xos"
-docker_registry: "{{ inventory_hostname }}:5000"
diff --git a/roles/xos-build/tasks/main.yml b/roles/xos-build/tasks/main.yml
index 6bf54a0..847a4e7 100644
--- a/roles/xos-build/tasks/main.yml
+++ b/roles/xos-build/tasks/main.yml
@@ -11,14 +11,11 @@
       xosdir.stat.exists == True
 
 - name: tag xos base container image
-  local_action: command docker tag xosproject/xos-base {{ docker_registry }}/xosproject/xos-base:candidate
+  local_action: command docker tag xosproject/xos-base {{ deploy_docker_registry }}/xosproject/xos-base:{{ deploy_docker_tag }}
   when:
       xosdir.stat.exists == True
 
 - name: publish XOS base container image to local repo
-  local_action: shell cd {{ xos_repo_dir }} && docker push {{ docker_registry }}/xosproject/xos-base:candidate
+  local_action: shell cd {{ xos_repo_dir }} && docker push {{ deploy_docker_registry }}/xosproject/xos-base:{{ deploy_docker_tag }}
   when:
       xosdir.stat.exists == True
-
-
-