diff --git a/roles/openshift_hosted/tasks/registry.yml b/roles/openshift_hosted/tasks/registry.yml
index bc4d81e..4720095 100644
--- a/roles/openshift_hosted/tasks/registry.yml
+++ b/roles/openshift_hosted/tasks/registry.yml
@@ -112,6 +112,7 @@
   when:
   - openshift_hosted_registry_storage_glusterfs_ips|length > 0
   - openshift_hosted_registry_storage_kind | default(none) in ['glusterfs']
+  - openshift_hosted_registry_storage_class is not defined
 
 - name: Create OpenShift registry
   oc_adm_registry:
diff --git a/roles/openshift_hosted/tasks/registry_storage.yml b/roles/openshift_hosted/tasks/registry_storage.yml
index aa66a78..e1b8c4e 100644
--- a/roles/openshift_hosted/tasks/registry_storage.yml
+++ b/roles/openshift_hosted/tasks/registry_storage.yml
@@ -2,3 +2,4 @@
 - include_tasks: storage/glusterfs.yml
   when:
   - openshift_hosted_registry_storage_kind | default(none) == 'glusterfs' or openshift_hosted_registry_storage_glusterfs_swap
+  - openshift_hosted_registry_storage_class is not defined
diff --git a/roles/openshift_hosted/tasks/storage/glusterfs.yml b/roles/openshift_hosted/tasks/storage/glusterfs.yml
index 7223a5a..3465b6c 100644
diff --git a/roles/openshift_persistent_volumes/tasks/main.yml b/roles/openshift_persistent_volumes/tasks/main.yml
index b1d9c8c..1c32a67 100644
--- a/roles/openshift_persistent_volumes/tasks/main.yml
+++ b/roles/openshift_persistent_volumes/tasks/main.yml
@@ -23,7 +23,21 @@
     - name: "{{ openshift_hosted_registry_storage_volume_name }}-glusterfs-claim"
       capacity: "{{ openshift_hosted_registry_storage_volume_size }}"
       access_modes: "{{ openshift_hosted_registry_storage_access_modes }}"
-  when: openshift_hosted_registry_storage_glusterfs_swap | default(False)
+  when: 
+    - openshift_hosted_registry_storage_glusterfs_swap | default(False)
+    - openshift_hosted_registry_storage_class is not defined
+
+
+- set_fact:
+    glusterfs_pv: []
+    glusterfs_pvc:
+    - name: "{{ openshift_hosted_registry_storage_volume_name }}-claim"
+      storageclass: "{{ openshift_hosted_registry_storage_class }}"
+      capacity: "{{ openshift_hosted_registry_storage_volume_size }}"
+      access_modes: "{{ openshift_hosted_registry_storage_access_modes }}"
+  when: 
+    - openshift_hosted_registry_storage_class is defined
+
 
 - name: create standard pv and pvc lists
   # generate_pv_pvcs_list is a custom action module defined in
diff --git a/roles/openshift_persistent_volumes/templates/persistent-volume-claim.yml.j2 b/roles/openshift_persistent_volumes/templates/persistent-volume-claim.yml.j2
index ca8b747..ce15533 100644
diff --git a/roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml b/roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml
index e91e130..f3562b6 100644
--- a/roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml
+++ b/roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml
@@ -12,4 +12,6 @@
 
 - name: Create GlusterFS registry volume
   command: "{{ glusterfs_heketi_client }} volume create --size={{ openshift_hosted_registry_storage_volume_size | replace('Gi','') }} --name={{ openshift_hosted_registry_storage_glusterfs_path }}"
-  when: "openshift_hosted_registry_storage_glusterfs_path not in registry_volume.stdout"
+  when: 
+    - "openshift_hosted_registry_storage_glusterfs_path not in registry_volume.stdout"
+    - "openshift_hosted_registry_storage_class is not defined"