diff --git a/.zuul.yaml b/.zuul.yaml
new file mode 100644
index 0000000..918f2e2
--- /dev/null
+++ b/.zuul.yaml
@@ -0,0 +1,36 @@
+- project:
+    name: openstack/ansible-role-k8s-glance
+    check:
+      jobs:
+        - ansible-role-k8s-glance-kubernetes-centos
+        - ansible-role-k8s-glance-openshift-centos
+
+- job:
+    name: ansible-role-k8s-glance-kubernetes-centos
+    parent:  ansible-role-k8s-base
+    nodeset: ansible-role-k8s-centos
+    vars:
+      coe: kubernetes
+      project_name: ansible-role-k8s-glance
+      ansible_role_k8s_required:
+        - ansible-role-k8s-mariadb
+        - ansible-role-k8s-keystone
+    required-projects:
+      - openstack/ansible-role-k8s-mariadb
+      - openstack/ansible-role-k8s-keystone
+      - openstack/ansible-role-k8s-glance
+
+- job:
+    name: ansible-role-k8s-glance-openshift-centos
+    parent:  ansible-role-k8s-base
+    nodeset: ansible-role-k8s-centos
+    vars:
+      coe: openshift
+      project_name: ansible-role-k8s-glance
+      ansible_role_k8s_required:
+        - ansible-role-k8s-mariadb
+        - ansible-role-k8s-keystone
+    required-projects:
+      - openstack/ansible-role-k8s-mariadb
+      - openstack/ansible-role-k8s-keystone
+      - openstack/ansible-role-k8s-glance
diff --git a/defaults/main.yml b/defaults/main.yml
index 6b2497a..d2bcd83 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -2,13 +2,19 @@ coe_host:
 coe_config_context:
 coe_config_file:
 action: provision
-
-service_name: glance
 namespace: openstack
 
+tls_enabled: false
+
 hieradata: {}
 hieradata_file: ''
 
+service_name: glance
+glance_port: 9292
+glance_hostname: "{{service_name}}"
+glance_address: "{{glance_hostname}}"
+glance_use_service_ip: true
+
 clouds_config: 'clouds-secret'
 
 glance_config:
@@ -29,8 +35,5 @@ glance_config:
   keystone_default_domain: 'default'
   keystone_region: 'regionOne'
   keystone_project: 'admin'
-  keystone_public_url: 'http://glance:9292'
-  keystone_internal_url: 'http://glance:9292'
-  keystone_admin_url: 'http://glance:9292'
   keystone_user_password: 'weakpassword'
   keystone_username: 'glance'
diff --git a/tasks/keystone.yml b/tasks/keystone.yml
index 9fcab65..851d928 100644
--- a/tasks/keystone.yml
+++ b/tasks/keystone.yml
@@ -3,12 +3,12 @@
     name: ansible-role-k8s-tripleo
     tasks_from: bootstrap-service-endpoints
   vars:
-    service_name: 'glance'
+#    service_name: '{{service_name}}'
     service_type: 'image'
     service_region: 'RegionOne'
     service_project: '{{glance_config.keystone_authtoken.project}}'
     service_password: '{{glance_config.keystone_authtoken.password}}'
     service_username: '{{glance_config.keystone_authtoken.username}}'
-    service_internal_url: '{{glance_config.keystone_internal_url}}'
-    service_public_url: '{{glance_config.keystone_public_url}}'
-    service_admin_url: '{{glance_config.keystone_admin_url}}'
+    service_internal_url: '{{ "https" if tls_enabled or "http"}}://{{glance_address}}:{{glance_port}}'
+    service_public_url: '{{ "https" if tls_enabled or "http"}}://{{glance_address}}:{{glance_port}}'
+    service_admin_url: '{{ "https" if tls_enabled or "http"}}://{{glance_address}}:{{glance_port}}'
diff --git a/tasks/provision.yml b/tasks/provision.yml
index 48741de..9478861 100644
--- a/tasks/provision.yml
+++ b/tasks/provision.yml
@@ -81,7 +81,6 @@
     name: ansible-role-k8s-tripleo
     tasks_from: create-database
   vars:
-    service_name: 'glance'
     database_name: 'glance'
 
 - name: Create glance db-sync job
@@ -115,7 +114,7 @@
     host: "{{coe_host}}"
     context: "{{coe_config_context}}"
     kubeconfig: "{{coe_config_file}}"
-    name: glance
+    name: "{{glance_hostname}}"
     namespace: "{{namespace}}"
     state: present
     ports:
@@ -123,9 +122,14 @@
         name: glance-api
     selector:
       app: glance-api
+  register: glance_service
+
+- set_fact:
+    glance_address: "{{glance_service.service.spec.cluster_ip}}"
+  when: glance_use_service_ip
 
 - name: Create glance deployment
-  k8s_v1beta1_deployment:
+  k8s_apps_v1beta1_deployment:
     host: "{{coe_host}}"
     context: "{{coe_config_context}}"
     kubeconfig: "{{coe_config_file}}"