diff --git a/conf/common/jobs.yml b/conf/common/jobs.yml
index fa96b7a49919fbca4db3545ebe14732ef17e5a3e..472a8c9a26b3476750df764f7b0f6dac550de474 100644
--- a/conf/common/jobs.yml
+++ b/conf/common/jobs.yml
@@ -25,21 +25,9 @@ JOBS:
     RUNNING: once
     WALLCLOCK: 01:00
 
-  PREPARE_DATE_LOCAL:
-    FILE: templates/common/prepare_date_local.sh # WARNING: Should be replaced in the specific workflow definition!
-    RUNNING: date
-    WALLCLOCK: 01:00
-    PLATFORM: LOCAL
-
-  PREPARE_DATE_REMOTE:
-    FILE: templates/common/prepare_date_remote.sh # WARNING: Should be replaced in the specific workflow definition!
-    RUNNING: date
-    WALLCLOCK: 01:00
-    PLATFORM: "%DEFAULT.HPCARCH%_LOGIN"
-
   PREPARE_MEMBER:
     FILE: templates/common/prepare_member.sh # WARNING: Should be replaced in the specific workflow definition!
-    DEPENDENCIES: PREPARE_EXPERIMENT PREPARE_DATE_REMOTE PREPARE_DATE_LOCAL
+    DEPENDENCIES: PREPARE_EXPERIMENT
     RUNNING: member
     WALLCLOCK: 01:00
 
@@ -50,7 +38,6 @@ JOBS:
     RUNNING: chunk
     TYPE: python
     EXECUTABLE: "%HPCROOTDIR%/%python_environment.folder_name%/bin/python3"
-    PLATFORM: "%DEFAULT.HPCARCH%_LOGIN"
 
   RUN_ICON:
     FILE: templates/common/run_icon.sh
@@ -84,4 +71,3 @@ JOBS:
     DEPENDENCIES: TRANSFER
     WALLCLOCK: 00:10
     RUNNING: member
-    PLATFORM: "%DEFAULT.HPCARCH%_LOGIN"
diff --git a/conf/real-from-dwd-ana/jobs.yml b/conf/real-from-dwd-ana/jobs.yml
index 2c9aa02152a5a28fc9faa94250921eedc38af5ec..2ce9baeaeac5577faf1126e2c3b6d4ca6d86755d 100644
--- a/conf/real-from-dwd-ana/jobs.yml
+++ b/conf/real-from-dwd-ana/jobs.yml
@@ -4,12 +4,18 @@ JOBS:
 
   PREPARE_DATE_LOCAL:
     FILE: templates/real-from-dwd-ana/prepare_date_local.sh
+    RUNNING: date
+    WALLCLOCK: 01:00
+    PLATFORM: LOCAL
 
   PREPARE_DATE_REMOTE:
     FILE: templates/real-from-dwd-ana/prepare_date_remote.sh
+    RUNNING: date
+    WALLCLOCK: 01:00
 
   PREPARE_MEMBER:
     FILE: templates/real-from-dwd-ana/prepare_member.sh
+    DEPENDENCIES: PREPARE_EXPERIMENT PREPARE_DATE_REMOTE PREPARE_DATE_LOCAL
 
   PREPARE_NAMELIST:
     FILE: templates/real-from-dwd-ana/prepare_namelist.py
\ No newline at end of file