diff --git a/frontend/src/i18n/translations/de.json b/frontend/src/i18n/translations/de.json
index 3c0ee36..7c3c395 100644
--- a/frontend/src/i18n/translations/de.json
+++ b/frontend/src/i18n/translations/de.json
@@ -229,6 +229,14 @@
         "six": "Sonstige Einstellungen nach Belieben vornehmen.",
         "seven": "Auf “Subscribe to calendar” klicken.",
         "eight": "Das Windows-Phone-Gerät muss mit dem gleichen Outlook.com-Benutzerkonto angemeldet sein. Fortan sollte die Synchronisierung des Kalenders automatisch erfolgen."
+      },
+      "htwk_app": {
+        "description": "Die HTWK-App bietet die Möglichkeit, den Stundenplan direkt in der App zu abonnieren. Dazu musst du nur den Token in der App einfügen und schon hast du deinen Stundenplan immer dabei. ",
+        "one": "Erstelle deinen Kalender und kopiere den Token.",
+        "two": "Öffne die HTWK-App und gehe in den Kalender.",
+        "three": "Dort fügst du den Token ein und schon hast du deinen Stundenplan immer dabei.",
+        "four": "Falls du bereits einen Kalender in der App abonniert hast, kannst du über den Button oben rechts den Kalender wechseln.",
+        "five": "Der Kalender in der HTWK App wird über einen weiteren Service der App stündlich aktualisiert. Wenn du den Kalender bearbeitest werden die Änderungen erst nach einer Stunde in der App sichtbar."
       }
     },
     "fourthQuestion": "Kalender abonnieren? Ich will den downloaden!",
diff --git a/frontend/src/i18n/translations/en.json b/frontend/src/i18n/translations/en.json
index 7f2992f..cd19f3c 100644
--- a/frontend/src/i18n/translations/en.json
+++ b/frontend/src/i18n/translations/en.json
@@ -229,6 +229,14 @@
         "six": "Make other settings as desired.",
         "seven": "Click on 'Subscribe to calendar.'",
         "eight": "The Windows Phone device must be logged in with the same Outlook.com user account. From now on, calendar synchronization should occur automatically."
+      },
+      "htwk_app": {
+        "description": "The HTWK app offers the possibility to subscribe to the timetable directly in the app. All you have to do is insert the token in the app and you'll always have your timetable with you. ",
+        "one": "Create your calendar and copy the token.",
+        "two": "Open the HTWK app and go to the calendar.",
+        "three": "Paste the token there and you'll always have your timetable with you.",
+        "four": "If you have already subscribed to a calendar in the app, you can change the calendar using the button at the top right.",
+        "five": "The calendar in the HTWK app is updated hourly via another service of the app. If you edit the calendar, the changes will only be visible in the app after one hour."
       }
     },
     "fourthQuestion": "Subscribe to the calendar? I want to download it!",
diff --git a/frontend/src/view/FaqView.vue b/frontend/src/view/FaqView.vue
index d856c85..db8067e 100644
--- a/frontend/src/view/FaqView.vue
+++ b/frontend/src/view/FaqView.vue
@@ -16,7 +16,8 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 -->
 
-<script lang="ts" setup></script>
+<script lang="ts" setup>
+</script>
 
 <template>
   <div class="flex align-items-center justify-content-center flex-column">
@@ -58,6 +59,16 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
                 </li>
               </ol>
             </AccordionTab>
+            <AccordionTab header="HTWK App">
+              <p>{{ $t("faqView.thirdAnswer.htwk_app.description") }}</p>
+              <ol>
+                <li>{{ $t("faqView.thirdAnswer.htwk_app.one") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.htwk_app.two") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.htwk_app.three") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.htwk_app.four") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.htwk_app.five") }}</li>
+              </ol>
+            </AccordionTab>
             <AccordionTab
               :header="$t('faqView.thirdAnswer.microsoft_outlook.title')"
             >
diff --git a/services/data-manager/Dockerfile b/services/data-manager/Dockerfile
index 9e52f5d..0799b2d 100644
--- a/services/data-manager/Dockerfile
+++ b/services/data-manager/Dockerfile
@@ -50,7 +50,7 @@ EXPOSE 8090
 ENTRYPOINT ["./main", "serve"]
 
 
-FROM golang:1.21.6 AS dev
+FROM golang:1.23 AS dev
 
 # Set the Current Working Directory inside the container
 WORKDIR /htwkalender-data-manager
diff --git a/services/ical/Dockerfile b/services/ical/Dockerfile
index 19d231c..446d796 100644
--- a/services/ical/Dockerfile
+++ b/services/ical/Dockerfile
@@ -49,7 +49,7 @@ EXPOSE 8091
 ENTRYPOINT ["./main"]
 
 
-FROM golang:1.21.6 AS dev
+FROM golang:1.23 AS dev
 
 # Set the Current Working Directory inside the container
 WORKDIR /htwkalender-ical