diff --git a/host-pottwal.yml b/host-pottwal.yml
index 78abefc..83bc77a 100644
--- a/host-pottwal.yml
+++ b/host-pottwal.yml
@@ -42,14 +42,16 @@
       ansible.builtin.stat:
         path: "{{ data_dir }}/forgejo"
       register: forgejo_dir
+      tags: ["forgejo"]
     - name: Fail if forgejo data dir does not exist
       ansible.builtin.fail:
         msg: "Forgejo data dir is missing, please restore from the backup!"
       when: not forgejo_dir.stat.exists
+      tags: ["forgejo"]
 
     # If port 2222 is changed here, it must also be adapted
     # in the forgejo config file (see application volume)!!
-    - name: Setup the docker container for gitea
+    - name: Setup the docker container for forgejo
       docker_container:
         name: forgejo
         image: "{{ forgejo_image }}"
@@ -73,6 +75,7 @@
           USER_GID: "1000"
         volumes:
           - "{{ data_dir }}/forgejo:/data:rw"
+      tags: ["forgejo"]
 
     - name: Setup proxy site "{{ forgejo_domain_name }}"
       include_role:
@@ -80,6 +83,7 @@
       vars:
         site_name: "{{ forgejo_domain_name }}"
         proxy_port: "{{ forgejo_host_port }}"
+      tags: ["forgejo"]
 
     - name: Ensure apt-cacher container is running
       docker_container:
diff --git a/host_vars/pottwal.n39.eu/vars.yml b/host_vars/pottwal.n39.eu/vars.yml
index f2814ce..29f3e26 100644
--- a/host_vars/pottwal.n39.eu/vars.yml
+++ b/host_vars/pottwal.n39.eu/vars.yml
@@ -12,7 +12,7 @@ cleanuri_amqp_vhost: "/cleanuri"
 forgejo_host_port: 9091
 forgejo_ssh_port: 2222
 forgejo_domain_name: git.n39.eu
-forgejo_image: codeberg.org/forgejo/forgejo:1.20
+forgejo_image: codeberg.org/forgejo/forgejo:1.21
 
 shlink_host_port: 8083
 shlink_domain_name: sl.n39.eu