diff --git a/sonarqube-postgresql-template.yaml b/sonarqube-postgresql-template.yaml
index 9d81032..ce2be9c 100644
--- a/sonarqube-postgresql-template.yaml
+++ b/sonarqube-postgresql-template.yaml
@@ -125,6 +125,8 @@ objects:
           volumeMounts:
           - mountPath: /opt/sonarqube/data
             name: sonarqube-data
+          - mountPath: /opt/sonarqube/extensions            
+            name: sonarqube-extensions
         dnsPolicy: ClusterFirst
         restartPolicy: Always
         securityContext: {}
@@ -133,6 +135,9 @@ objects:
         - name: sonarqube-data
           persistentVolumeClaim:
             claimName: sonarqube-data
+        - name: sonarqube-extensions
+          persistentVolumeClaim:
+            claimName: sonarqube-extensions
     triggers:
     - type: ConfigChange
     - imageChangeParams:
@@ -266,7 +271,17 @@ objects:
     - ReadWriteOnce
     resources:
       requests:
-        storage: ${SONAR_VOLUME_CAPACITY}
+        storage: ${SONAR_DATA_VOLUME_CAPACITY}
+- apiVersion: v1
+  kind: PersistentVolumeClaim
+  metadata:
+    name: sonarqube-extensions
+  spec:
+    accessModes:
+    - ReadWriteOnce
+    resources:
+      requests:
+        storage: ${SONAR_EXTENSIONS_VOLUME_CAPACITY}
 parameters:
 - displayName: SonarQube version
   value: "6.7"
@@ -283,8 +298,13 @@ parameters:
   name: POSTGRESQL_VOLUME_CAPACITY
   required: true
   value: 1Gi
-- description: Volume space available for SonarQube
+- description: Volume space available for SonarQube Data
   displayName: SonarQube Volume Capacity
-  name: SONAR_VOLUME_CAPACITY
+  name: SONAR_DATA_VOLUME_CAPACITY
+  required: true
+  value: 1Gi
+- description: Volume space available for SonarQube Extensions (used for plugins)
+  displayName: SonarQube Extensions (plugins) Volume Capacity
+  name: SONAR_EXTENSIONS_VOLUME_CAPACITY
   required: true
-  value: 1Gi
\ No newline at end of file
+  value: 1Gi  
diff --git a/sonarqube-template.yaml b/sonarqube-template.yaml
index efda5fc..525859f 100644
--- a/sonarqube-template.yaml
+++ b/sonarqube-template.yaml
@@ -118,6 +118,8 @@ objects:
           volumeMounts:
           - mountPath: /opt/sonarqube/data
             name: sonarqube-data
+          - mountPath: /opt/sonarqube/extensions
+            name: sonarqube-extensions            
         dnsPolicy: ClusterFirst
         restartPolicy: Always
         securityContext: {}
@@ -126,6 +128,9 @@ objects:
         - name: sonarqube-data
           persistentVolumeClaim:
             claimName: sonarqube-data
+        - name: sonarqube-extensions
+          persistentVolumeClaim:
+            claimName: sonarqube-extensions
     triggers:
     - type: ConfigChange
     - imageChangeParams:
@@ -145,14 +150,29 @@ objects:
     - ReadWriteOnce
     resources:
       requests:
-        storage: ${SONAR_VOLUME_CAPACITY}
+        storage: ${SONAR_DATA_VOLUME_CAPACITY}
+- apiVersion: v1
+  kind: PersistentVolumeClaim
+  metadata:
+    name: sonarqube-extensions
+  spec:
+    accessModes:
+    - ReadWriteOnce
+    resources:
+      requests:
+        storage: ${SONAR_EXTENSIONS_VOLUME_CAPACITY}
 parameters:
 - displayName: SonarQube version
   value: "6.7"
   name: SONARQUBE_VERSION
   required: true
-- description: Volume space available for SonarQube
+- description: Volume space available for SonarQube Data
   displayName: SonarQube Volume Capacity
-  name: SONAR_VOLUME_CAPACITY
+  name: SONAR_DATA_VOLUME_CAPACITY
+  required: true
+  value: 1Gi
+- description: Volume space available for SonarQube Extensions (used for plugins)
+  displayName: SonarQube Extensions (plugins) Volume Capacity
+  name: SONAR_EXTENSIONS_VOLUME_CAPACITY
   required: true
-  value: 1Gi
\ No newline at end of file
+  value: 1Gi