diff --git a/kubernetes/apps/sonarqube/app/ingress.yaml b/kubernetes/apps/sonarqube/app/ingress.yaml
deleted file mode 100644
index f7404ba..0000000
--- a/kubernetes/apps/sonarqube/app/ingress.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: sonarqube-ingress
-  namespace: sonarqube
-  annotations:
-    nginx.ingress.kubernetes.io/ssl-redirect: "false"
-    nginx.ingress.kubernetes.io/use-regex: "true"
-spec:
-  ingressClassName: nginx
-  rules:
-    - host: "sonarqube.cluster.edward.sydney"
-      http:
-        paths:
-          - pathType: Prefix
-            path: "/"
-            backend:
-              service:
-                name: sonarqube
-                port:
-                  number: 80
\ No newline at end of file
diff --git a/kubernetes/apps/sonarqube/app/release.yaml b/kubernetes/apps/sonarqube/app/release.yaml
index b2f5a4c..6b2364d 100644
--- a/kubernetes/apps/sonarqube/app/release.yaml
+++ b/kubernetes/apps/sonarqube/app/release.yaml
@@ -17,16 +17,26 @@ spec:
     remediation:
       retries: 3
   values:
+    sonarqubeUsername: ${sonarqube_username}
+    sonarqubePassword: ${sonarqube_password}
+    sonarqubeEmail: ${sonarqube_email}
     smtpHost: ${smtp_host}
     smtpPort: ${smtp_port}
     smtpUser: ${smtp_user}
     smtpPassword: ${smtp_password}
     smtpProtocol: ${smtp_protocol}
+    service:
+      ports:
+        http: 8090
+        elastic: 9091
+      nodePorts:
+        http: 30080
+        elastic: 30091
     persistence:
       enabled: true
       storageClass: "local-path"
       size: "32Gi"
-      existingClaim: ""
+      existingClaim: "sonarqube-pvc"
     postgresql:
       enabled: false
     externalDatabase:
diff --git a/kubernetes/apps/sonarqube/app/volume.yaml b/kubernetes/apps/sonarqube/app/volume.yaml
new file mode 100644
index 0000000..d6f625d
--- /dev/null
+++ b/kubernetes/apps/sonarqube/app/volume.yaml
@@ -0,0 +1,46 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: sonarqube-pv
+  namespace: sonarqube
+  labels:
+    type: local
+spec:
+  storageClassName: local-path
+  volumeMode: Filesystem
+  capacity:
+    storage: 32Gi
+  accessModes:
+    - ReadWriteOnce
+  persistentVolumeReclaimPolicy: Retain
+  local:
+    path: "/mnt/nfs/AppData/sonarqube"
+  claimRef:
+    apiVersion: v1
+    kind: PersistentVolumeClaim
+    name: sonarqube-pvc
+    namespace: sonarqube
+  nodeAffinity:
+    required:
+      nodeSelectorTerms:
+        - matchExpressions:
+            - key: kubernetes.io/hostname
+              operator: In
+              values:
+                - rpi5-cluster-node-3
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: sonarqube-pvc
+  namespace: sonarqube
+  labels:
+    name: sonarqube-pvc
+spec:
+  storageClassName: local-path
+  volumeMode: Filesystem
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 32Gi
\ No newline at end of file
diff --git a/kubernetes/apps/sonarqube/sonarqube.yaml b/kubernetes/apps/sonarqube/sonarqube.yaml
index 7f8ee63..0fd057c 100644
--- a/kubernetes/apps/sonarqube/sonarqube.yaml
+++ b/kubernetes/apps/sonarqube/sonarqube.yaml
@@ -7,7 +7,7 @@ spec:
   interval: 10m
   timeout: 1m30s
   retryInterval: 30s
-  targetNamespace: redis
+  targetNamespace: sonarqube
   path: ./sonarqube
   prune: true
   sourceRef:
@@ -39,7 +39,7 @@ spec:
     name: flux-system
   dependsOn:
     - name: sonarqube-secrets
-      namespace: redis
+      namespace: sonarqube
   postBuild:
     substituteFrom:
       - kind: Secret