diff --git a/00001SimpleFunctionsHS/meta.xml b/00001SimpleFunctionsHS/meta.xml
index cbacb432e7e39e91cf7c846b8054dac1fddc00ae..cbf84350833b4c08c78f06612e02d455a563f61a 100644
--- a/00001SimpleFunctionsHS/meta.xml
+++ b/00001SimpleFunctionsHS/meta.xml
@@ -1,7 +1,8 @@
-<task id="0001SimpleFunctions" lang="haskell" attempts="5" >
+<?xml version="1.0" encoding="utf-8"?>
+<task id="0001SimpleFunctions" lang="haskell" attempts="5">
   <name>Beispiel in Haskell</name>
   <evaluator>hs</evaluator>
-  <description></description>
+  <description/>
   <submissionModes default="TEXT">
     <submissionMode name="TEXT"/>
     <submissionMode name="FILE"/>
@@ -9,9 +10,9 @@
   <files>
     <file public="true" type="template" path="Fac.hs"/>
     <file public="false" type="solution" path="Fac.hs"/>
-    <file public="true" type="test" path="MyTest.hs"></file>
-    <file public="true" type="test" path="TestsPublic.lhs"></file>
-    <file public="true" type="test" path="TestsHidden.hs"></file>
+    <file public="true" type="test" path="MyTest.hs"/>
+    <file public="true" type="test" path="TestsPublic.lhs"/>
+    <file public="true" type="test" path="TestsHidden.hs"/>
     <file public="false" type="test" path="MyTestApproval.hs"/>
   </files>
-</task>
+</task>
\ No newline at end of file
diff --git a/153FunktionenInC/meta.xml b/153FunktionenInC/meta.xml
index 454d9ce167ac5b19e5d8a627d6c9ea85804d2e98..7f89811e4dba46816827e827d940ae7c8b58f6db 100644
--- a/153FunktionenInC/meta.xml
+++ b/153FunktionenInC/meta.xml
@@ -1,12 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
 <task id="153Funktionen" lang="C" attempts="17">
   <name>Erste c-Funktionen</name>
-  <evaluator image="registry.gitlab.com/sveneric/subato/executor_c:8">c</evaluator>
+  <evaluator>c</evaluator>
   <description>Erste Funktionen in C</description>
   <files>
     <file public="true" type="template" path="beispiele.c"/>
     <file public="false" type="solution" path="beispiele.c"/>
-    <file public="true" type="include" path="beispiele.h"></file>
-    <file public="true" type="test" path="test.c"></file>
-    <file public="true" type="test" path="my_test_approval.c"></file>
+    <file public="true" type="include" path="beispiele.h"/>
+    <file public="true" type="test" path="test.c"/>
+    <file public="true" type="test" path="my_test_approval.c"/>
   </files>
-</task>
+</task>
\ No newline at end of file
diff --git a/212Date/meta.xml b/212Date/meta.xml
index 93f1b6de713059527a9bf981bed9af00fc9b7f97..8c0715f76e21b599db7366332f5d8dc0266674f2 100644
--- a/212Date/meta.xml
+++ b/212Date/meta.xml
@@ -1,10 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
 <task subatoId="212" id="212Date" lang="Kotlin" attempts="5">
   <name>Date</name>
-  <evaluator image="registry.gitlab.com/sveneric/subato/executor_kotlin:1">kotlin</evaluator>
+  <evaluator>kotlin</evaluator>
   <description>Eine Datumsklasse in Kotlin</description>
   <files>
     <file public="true" type="template" path="name/panitz/kotlin/date/Date.kt"/>
     <file public="false" type="solution" path="name/panitz/kotlin/date/Date.kt"/>
     <file public="false" type="test" path="DateTes.kt"/>
   </files>
-</task>
+</task>
\ No newline at end of file
diff --git a/213Funktionen/meta.xml b/213Funktionen/meta.xml
index 42b25db8740c4e618b6d9fd5af6d4dca2e8fe767..ab6169137c9baf369ae26d8b84d82614e9e43f68 100644
--- a/213Funktionen/meta.xml
+++ b/213Funktionen/meta.xml
@@ -1,10 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
 <task subatoId="213" id="213Funktionen" lang="Kotlin" attempts="5">
   <name>List in Kotlin-Funktionen</name>
-  <evaluator image="registry.gitlab.com/sveneric/subato/executor_kotlin:1">kotlin</evaluator>
+  <evaluator>kotlin</evaluator>
   <description>Einfach verkettete Listen</description>
   <files>
     <file public="true" type="template" path="name/panitz/util/List.kt"/>
     <file public="false" type="solution" path="name/panitz/util/List.kt"/>
     <file public="false" type="test" path="ListTes.kt"/>
   </files>
-</task>
+</task>
\ No newline at end of file
diff --git a/4725FakultaetCPP/meta.xml b/4725FakultaetCPP/meta.xml
index 437e702916af7836ad31dda328a8c49c75d51a2f..4cbc8b95f076f7100b5d21f8a5b243daba8e9128 100644
--- a/4725FakultaetCPP/meta.xml
+++ b/4725FakultaetCPP/meta.xml
@@ -1,7 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
 <task id="4725FakultCPP" lang="cpp" attempts="5">
   <name>C++ Fakultät</name>
   <evaluator>cpp</evaluator>
-  <description></description>
+  <description/>
   <submissionModes default="TEXT">
     <submissionMode name="TEXT"/>
     <submissionMode name="FILE"/>
@@ -9,8 +10,8 @@
   <files>
     <file public="true" type="template" path="fac.cc"/>
     <file public="false" type="solution" path="fac.cc"/>
-    <file public="true" type="include" path="fac.h"></file>
-    <file public="true" type="test" path="my_test.cc"></file>
+    <file public="true" type="include" path="fac.h"/>
+    <file public="true" type="test" path="my_test.cc"/>
     <file public="false" type="test" path="my_test_approval.cc"/>
   </files>
-</task>
+</task>
\ No newline at end of file
diff --git a/662Records/meta.xml b/662Records/meta.xml
index 4ba09e053b295c116fde09038868a62beca11574..4d2ef50ee706af42e18870b563b76cdf522f93b7 100644
--- a/662Records/meta.xml
+++ b/662Records/meta.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
 <task subatoId="662" submissionMode="TEXT" id="662Records" lang="Java" attempts="10">
   <name>Java 15 Records</name>
-  <evaluator image="registry.gitlab.com/sveneric/subato/executor_java15:1">java15</evaluator>
+  <evaluator>java15</evaluator>
   <description>Erste Experimente mit Java 15</description>
   <files>
     <file public="true" type="template" path="Pair.java"/>
diff --git a/663Record/meta.xml b/663Record/meta.xml
index b92a72ec6d4216f2556b396ef0974a67c7b96ec2..a0f2baec77113ff4ee076dbf83c5dcd01335bb39 100644
--- a/663Record/meta.xml
+++ b/663Record/meta.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
 <task subatoId="663" id="663Record" lang="Java" attempts="5">
   <name>Ein Record für Date</name>
-  <evaluator image="registry.gitlab.com/sveneric/subato/executor_java15:1">java15</evaluator>
+  <evaluator>java15</evaluator>
   <description>Die Date Klasse aus dem ersten Semester jetzt als Record.</description>
   <files>
     <file public="true" type="template" path="name/panitz/record/Date.java"/>
diff --git a/664BinTree/meta.xml b/664BinTree/meta.xml
index 13221ad53d8bd6c4e6840afebde1189923a4be05..dc53165cfd129ba441a962d99696eb45aa7159e6 100644
--- a/664BinTree/meta.xml
+++ b/664BinTree/meta.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <task subatoId="664" id="664BinTree" lang="scala" attempts="5">
   <name>BinTree</name>
   <evaluator>scala</evaluator>
@@ -7,4 +8,4 @@
     <file public="false" type="solution" path="BinTree.scala"/>
     <file public="false" type="test" path="BinTreeTest.scala"/>
   </files>
-</task>
+</task>
\ No newline at end of file
diff --git a/665Funktionen/meta.xml b/665Funktionen/meta.xml
index e95f12f423eace73a8a8f088060c7baed1353714..9b45d839797edc22015ba2f3f806a436bc0667ef 100644
--- a/665Funktionen/meta.xml
+++ b/665Funktionen/meta.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
 <task subatoId="665" id="665Funktionen" lang="Python" attempts="5">
   <name>Python: Erste Funktionen</name>
-  <evaluator image="registry.gitlab.com/sveneric/subato/executor_python:2">python</evaluator>
+  <evaluator>python</evaluator>
   <description>Fakultät und Quersumme in Python</description>
   <files>
     <file public="true" type="template" path="quersumme.py"/>
diff --git a/667Baumstruktur/meta.xml b/667Baumstruktur/meta.xml
index d6a5839e5d427d92a4d1bf2d8c0a424678a75730..40c345b8cfaa755c013dc9b24a74cfd484302d9c 100644
--- a/667Baumstruktur/meta.xml
+++ b/667Baumstruktur/meta.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
 <task subatoId="667" id="667Baumstruktur" lang="Python" attempts="5">
   <name>Python: Eine Baumstruktur</name>
-  <evaluator image="registry.gitlab.com/sveneric/subato/executor_python:2">python</evaluator>
+  <evaluator>python</evaluator>
   <description>Eine allgemeine Baumstruktur  in Python</description>
   <files>
     <file public="true" type="template" path="Baum.py"/>
diff --git a/668Funktionen/meta.xml b/668Funktionen/meta.xml
index 7e86cdaf75459f3e538a4c612ca45031946900bc..272a6530655bcef894db3c1ecba5c6a8cf0c7e4b 100644
--- a/668Funktionen/meta.xml
+++ b/668Funktionen/meta.xml
@@ -1,10 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
 <task subatoId="668" id="668Funktionen" lang="Go" attempts="5">
   <name>Go: Erste Funktionen</name>
-  <evaluator image="registry.gitlab.com/sveneric/subato/executor_go:1">go</evaluator>
+  <evaluator>go</evaluator>
   <description>Fakultät und Quersumme in Go</description>
   <files>
     <file public="true" type="template" path="first/first.go"/>
     <file public="false" type="solution" path="first/first.go"/>
     <file public="false" type="test" path="firstTEST_test.go"/>
   </files>
-</task>
+</task>
\ No newline at end of file
diff --git a/669Interpreter/meta.xml b/669Interpreter/meta.xml
index d62bd12e563dc223cc45bb72ca1fd88164b92df1..7cc48c3b64eee8b194000d7d4800f0c4aeeb3041 100644
--- a/669Interpreter/meta.xml
+++ b/669Interpreter/meta.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
 <task subatoId="669" id="669Interpreter" lang="Java" attempts="5">
   <name>Interpreter einer While-Sprache</name>
-  <evaluator image="registry.gitlab.com/sveneric/subato/executor_java15:1">java15</evaluator>
+  <evaluator>java15</evaluator>
   <description>Ein kleiner Interpreter über Ausdrücke, die als Record-Objekte vorliegen</description>
   <files>
     <file public="true" type="template" path="name/panitz/Interpreter.java"/>
diff --git a/671Javascript/meta.xml b/671Javascript/meta.xml
index 5b216a75b34e1b54f11268c7c6f5cd555f021875..a7b2792b1add7da96d48f185c207d34be25e15c5 100644
--- a/671Javascript/meta.xml
+++ b/671Javascript/meta.xml
@@ -1,10 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
 <task subatoId="671" id="671Javascript" lang="js" attempts="5">
   <name>Javascript: Erste Funktionen</name>
-  <evaluator image="registry.gitlab.com/sveneric/subato/executor_js:2">js</evaluator>
+  <evaluator>js</evaluator>
   <description>Fakultät und Quersumme ... in Javascript</description>
   <files>
     <file public="true" type="template" path="first.js"/>
     <file public="false" type="solution" path="first.js"/>
     <file public="false" type="test" path="test.js"/>
   </files>
-</task>
+</task>
\ No newline at end of file
diff --git a/672Javascript/meta.xml b/672Javascript/meta.xml
index afab707891f8096d79a26d591ca554eaca3adb79..cd93e57eeccb4fb71ba51ca02be69ac4ff10f88a 100644
--- a/672Javascript/meta.xml
+++ b/672Javascript/meta.xml
@@ -1,10 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
 <task subatoId="672" id="672Javascript" lang="js" attempts="5">
   <name>Javascript: Binärer Suchbaum</name>
-  <evaluator image="registry.gitlab.com/sveneric/subato/executor_js:2">js</evaluator>
+  <evaluator>js</evaluator>
   <description>Ein Menge als binärer Suchbaum in Javascript</description>
   <files>
     <file public="true" type="template" path="binTree.js"/>
     <file public="false" type="solution" path="binTree.js"/>
     <file public="false" type="test" path="test.js"/>
   </files>
-</task>
+</task>
\ No newline at end of file
diff --git a/844Fakult/meta.xml b/844Fakult/meta.xml
index e549a8eef9143268c82b9d226ba2e0670dcc232d..2b9a6fe0f6c2b88b9e42977dcfd2159d577c4d84 100644
--- a/844Fakult/meta.xml
+++ b/844Fakult/meta.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <task subatoId="844" id="844Fakult" lang="elm" attempts="5">
   <name>Elm Fakultät</name>
   <evaluator>elm</evaluator>
@@ -9,6 +10,6 @@
   <files>
     <file public="true" type="template" path="Fac.elm"/>
     <file public="false" type="solution" path="Fac.elm"/>
-    <file public="true" type="test" path="FacTest.elm"></file>
+    <file public="true" type="test" path="FacTest.elm"/>
   </files>
-</task>
+</task>
\ No newline at end of file
diff --git a/917Untersuchen/meta.xml b/917Untersuchen/meta.xml
index d0d8219c638a192fdbb139b87d1c9a349566eb57..7e37a251c23dd4dfd44df1d1f1e3dbd5ea5b8215 100644
--- a/917Untersuchen/meta.xml
+++ b/917Untersuchen/meta.xml
@@ -1,6 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
 <task id="917Untersuchen" submissionMode="TEXT" attempts="1000">
   <name>Dinge untersuchen</name>
   <description>Untersuchen Sie zwei Dinge auf ihre Eigenschaften.</description>
-  <files>
-  </files>
-</task>
+</task>
\ No newline at end of file
diff --git a/918Untersuchen/meta.xml b/918Untersuchen/meta.xml
index 7957c76a5d08a5c4651f9b1c7c3db591ddf8d662..bfafefc9d81f236762477c8d9e3b6b859ed59eb7 100644
--- a/918Untersuchen/meta.xml
+++ b/918Untersuchen/meta.xml
@@ -1,6 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
 <task id="918Untersuchen" submissionMode="TEXT" attempts="1000">
   <name>Mehr Dinge untersuchen</name>
   <description>Untersuchen Sie weitere Dinge auf ihre Eigenschaften.</description>
-  <files>
-  </files>
-</task>
+</task>
\ No newline at end of file
diff --git a/ReaktionsgleichungenAusgleichen1/meta.xml b/ReaktionsgleichungenAusgleichen1/meta.xml
index 05edf0e6a98be32e9a121b197c04733c08eb6aaa..b304787bfe2d30161335798992a1ab7ef0631b50 100644
--- a/ReaktionsgleichungenAusgleichen1/meta.xml
+++ b/ReaktionsgleichungenAusgleichen1/meta.xml
@@ -1,10 +1,11 @@
-<task id="ReaktionsgleichungenAusgleichen"  attempts="5000">
+<?xml version="1.0" encoding="utf-8"?>
+<task id="ReaktionsgleichungenAusgleichen" attempts="5000">
   <name>Chemische Reaktionsgleichungen</name>
-  <evaluator>reaktionsgleichungen</evaluator>  
+  <evaluator>reaktionsgleichungen</evaluator>
   <description>Chemische Reaktionsgleichungen</description>
   <files>
-    <file public="false" mimeType="text/plain" type="solution" path="solution.txt"/>
-    <file public="true"  mimeType="text/plain" type="template" path="solution.txt"/>
-    <file public="false" mimeType="text/plain" type="test"     path="test.txt"/>
+    <file public="false" type="solution" path="solution.txt"/>
+    <file public="true" type="template" path="solution.txt"/>
+    <file public="false" type="test" path="test.txt"/>
   </files>
-</task>
+</task>
\ No newline at end of file