diff --git a/README.md b/README.md
index de4da8d424d8336eed2c662bf3e74e2b4748dac8..f3b2bfe14be500df86d195ea674951905791ac54 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,11 @@ The two charts which need to be installed in the cluster:
  * `dependencies` installs and configures the required k8s controllers and CRDs
  * `resources` installs the required resources that implement provisioner logic
 
+In the dependencies chart, ensure the appropriate `storageClassName` is set for your cluster.
+In the resources chart, ensure the correct `kafkaEndpoint` is set.
+
+<b>Note: Currently, the charts have to be installed as-is with all their listed dependencies. Do not try to replace a dependency with one that you already have running, such as using an already existing gitea instance. Decoupling of dependencies is still a work in progress!</b>
+
 Before running helm install ensure that the following `secrets` are present:
  * `ec-pull-secret` allows the installer or the argo workflows to pull the necessary images from code.europa.eu (EC_USERNAME: gitlab username, EC_PASSWORD: gitlab password or token)
  * `ionos-provider` access token for the Ionos cloud API
diff --git a/build_package.sh b/build_package.sh
new file mode 100644
index 0000000000000000000000000000000000000000..b1cc1a304273a8b821a9386ed7243bafc27170ca
--- /dev/null
+++ b/build_package.sh
@@ -0,0 +1,4 @@
+# Builds the crossplane configuration package image and pushes it to EC gitlab
+# VERSION=v0.3.7
+crossplane xpkg build -f package/ -e package/examples/ -o configuration-${VERSION}.xpkg --verbose
+crossplane xpkg push code.europa.eu:4567/simpl/simpl-open/development/infrastructure/infrastructure-crossplane/configuration:${VERSION} -f configuration-${VERSION}.xpkg --domain https://code.europa.eu
\ No newline at end of file
diff --git a/charts/dependencies/values.yaml b/charts/dependencies/values.yaml
index a378022a42aad8dcaf9cbf440fe60894049b94b3..f9e8b9c00a5b55ce984b40f6b9f37031d1939b9a 100644
--- a/charts/dependencies/values.yaml
+++ b/charts/dependencies/values.yaml
@@ -3,11 +3,11 @@ crossplane:
     - ec-pull-secret
   configuration:
     packages:
-      - code.europa.eu:4567/simpl/simpl-open/development/infrastructure/infrastructure-crossplane/configuration:v0.3.5
+      - code.europa.eu:4567/simpl/simpl-open/development/infrastructure/infrastructure-crossplane/configuration:v0.3.6
 
 gitea:
-  storageClassName: standard
-  # storageClassName: csi-cinder-high-speed
+  # storageClassName: standard
+  storageClassName: csi-cinder-high-speed
   volumeSize: 100G
   service:
     http:
diff --git a/k8s/debug.yaml b/k8s/debug.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d26eebb6e94d823f529e285527da387340af63c8
--- /dev/null
+++ b/k8s/debug.yaml
@@ -0,0 +1,29 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: kafkacat
+  namespace: infrastructure
+spec:
+  containers:
+  - name: kafkacat
+    image: confluentinc/cp-kafkacat
+    command:
+      - sleep
+      - "3600"
+    imagePullPolicy: Always
+  restartPolicy: Never
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  name: nettools
+  namespace: infrastructure
+spec:
+  containers:
+  - name: nettools
+    image: jrecord/nettools:latest
+    command:
+      - sleep
+      - "3600"
+    imagePullPolicy: Always
+  restartPolicy: Never
\ No newline at end of file
diff --git a/package/apis/demo/ionos.yaml b/package/apis/demo/ionos.yaml
index f0e6e8091f3bb8c3bed4056d14d41fcadd294308..d15f786f6f2a018a056eea4ea81b4a45d4e80b19 100644
--- a/package/apis/demo/ionos.yaml
+++ b/package/apis/demo/ionos.yaml
@@ -177,7 +177,7 @@ spec:
             type: SSD Standard
             bus: VIRTIO
             availabilityZone: AUTO
-            imageAlias: ubuntu:latest
+            imageAlias: ubuntu:22.04
             imagePassword: testpassword1234
             userData: foo
             datacenterConfig:
diff --git a/package/crossplane.yaml b/package/crossplane.yaml
index 3e6dfc6629ed231d87ae15d365982e1e067ff0d9..6afa4405c52148af54e440ffd38fdfb098e670a2 100644
--- a/package/crossplane.yaml
+++ b/package/crossplane.yaml
@@ -8,7 +8,7 @@ metadata:
     meta.crossplane.io/license: MIT
     meta.crossplane.io/description: Catalogue offerings demo in IonosCloud
     meta.crossplane.io/readme: A Configuration package demo that contains Definitions and Compositions for provisioning Catalogue offerings in IonosCloud
-    meta.crossplane.io/version: 0.3.4
+    meta.crossplane.io/version: 0.3.6
 
 spec:
   crossplane:
diff --git a/local-setup.sh b/setup.sh
similarity index 73%
rename from local-setup.sh
rename to setup.sh
index 4400e9b2edd40cc171a59861a0ee74a14cb3f28c..2bd1c148d4465b5692ba92cde2de07af8f3d5d4f 100644
--- a/local-setup.sh
+++ b/setup.sh
@@ -8,9 +8,9 @@ helm install provisioner-dependencies -n $NS charts/dependencies
 sleep 60
 helm install provisioner-resources -n $NS charts/resources
 
-# Use locally to get access tokens and forward service ports
-# echo "Bearer $(kubectl get -n $NS secret cli.service-account-token -o=jsonpath='{.data.token}' | base64 --decode)" > argowftoken
-# kubectl get -n $NS secret argocd-initial-admin-secret  -o jsonpath="{.data.password}" | base64 -d > argopw
+# Use when installing locally to get access tokens and forward service ports
+echo "Bearer $(kubectl get -n $NS secret cli.service-account-token -o=jsonpath='{.data.token}' | base64 --decode)" > argowftoken
+kubectl get -n $NS secret argocd-initial-admin-secret  -o jsonpath="{.data.password}" | base64 -d > argopw
 # kubectl port-forward -n $NS svc/argocd-server 8888:443
 # kubectl port-forward -n $NS svc/argowf-argo-workflows-server 8777:2746
 # kubectl port-forward -n $NS svc/gitea-http 8333:3000
\ No newline at end of file