diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ab30333d658f2e6c6c22973763d66c7185f65c75..c54b5bb4d9a21ade0b907db710e2d00d8e6c2000 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -353,13 +353,8 @@ test-dns:
     - *debug_information
     - cd ansible/
     - pytest -v -s -m 'dns' --connection=ansible --ansible-inventory=${CLUSTER_DIR}/inventory.yml --hosts='ansible://*'
-  rules:
-    - changes:
-        - .gitlab-ci.yml
-        - ansible/**/*
-        - flux/**/*
-        - test/**/*
-        - openappstack/**/*
+  extends:
+    - .general_rules
   interruptible: true
 
 setup-openappstack:
@@ -653,15 +648,9 @@ testinfra:
     - *debug_information
     - cd ansible/
     - pytest -v -s -m 'testinfra' --connection=ansible --ansible-inventory=${CLUSTER_DIR}/inventory.yml --hosts='ansible://*'
-  rules:
-    - changes:
-        - .gitlab-ci.yml
-        - ansible/**/*
-        - flux/**/*
-        - test/**/*
-        - openappstack/**/*
   extends:
     - .ssh_setup
+    - .general_rules
   interruptible: true
 
 prometheus-stack-alerts:
diff --git a/.gitlab/ci_scripts/create_vps.sh b/.gitlab/ci_scripts/create_vps.sh
index 123755568eb647318f686134c4e94b8b889bbdb0..0e8972148008b1bca0ccb1660189323714320935 100644
--- a/.gitlab/ci_scripts/create_vps.sh
+++ b/.gitlab/ci_scripts/create_vps.sh
@@ -17,5 +17,5 @@ python3 -m openappstack $HOSTNAME create \
   --ssh-key-id $SSH_KEY_ID \
   --create-domain-records \
   --subdomain $SUBDOMAIN \
-  --disk-image-id '-7121' \
+  --disk-image-id '-7473' \
   --truncate-subdomain
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b22e60dca6432828ccb70e234471bf93a5bb3277..b48c5f1643c3805a8a496a6fff07c98a0946d9a0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,7 +8,8 @@ for details.
 
 ## Preparing the development environment
 
-Make sure you have development dependencies installed in your development environment.
+Make sure you have development dependencies installed in your development
+environment.
 
 ```
 pip install -r requirements-dev.txt
@@ -80,14 +81,24 @@ use it. This is a manual process for now. Follow these steps:
    ```
    $ python3 -m openappstack <cluster> install --install-kubernetes --no-install-openappstack
    ```
+3. Log into your machine and clean up the k3s server, then delete the cluster 
+   data:
+   ```
+   # Clean up running containers and firewall
+   /usr/local/bin/k3s-killall.sh
+   # Remove k3s state
+   rm -rf /var/lib/rancher/k3s
+   ```
 3. Log into Cosmos with the OpenAppStack account
 4. Go to VPS Cloud -> VPS and shut down your VPS
 5. Go to VPS Cloud -> Disk Images and click edit for your VPSs disk image
    1. Change the Disk Label to something like `k3s-template`
    2. Set VPS to `-- not assigned --`
    3. Click 'make template'
-   4. Remember the disk image ID that you can see in the current URL as `id=...`
-   5. Click save
+   4. Choose "Linux Latest LTS" as the kernel
+   5. Choose OS type Debian 10
+   6. Remember the disk image ID that you can see in the current URL as `id=...`
+   7. Click save
 6. Change the `--disk-image-id` argument in `.gitlab/ci_scripts/create_vps.sh`
    to your current disk-image-id **with a minus in front of it**. This is
    because custom images are negative integers, whereas Greenhost's disk images