diff --git a/custom_components/changelog.txt b/custom_components/changelog.txt
index 9a41ec24..9e994390 100644
--- a/custom_components/changelog.txt
+++ b/custom_components/changelog.txt
@@ -1,4 +1,8 @@
-Version 0.0.22 (2021-12-16)
+Version 0.0.22.2 (2021-12-16)
+- Add DE translation
+- Update NL translation
+
+Version 0.0.22.1 (2021-12-16)
 - Fix resolve names for all given ports incl. tls (update hahomematic)
 - Rename attributes to match eQ-3 naming 
 - Don't use title() for instance_name
diff --git a/custom_components/hahm/config_flow.py b/custom_components/hahm/config_flow.py
index fde125a0..b22d62df 100644
--- a/custom_components/hahm/config_flow.py
+++ b/custom_components/hahm/config_flow.py
@@ -16,8 +16,6 @@
     ATTR_USERNAME,
     ATTR_VERIFY_TLS,
     DEFAULT_TLS,
-    IP_ANY_V4,
-    PORT_ANY,
 )
 import voluptuous as vol
 from voluptuous.schema_builder import Schema
@@ -70,10 +68,10 @@
     {
         vol.Required(ATTR_INSTANCE_NAME): str,
         vol.Required(ATTR_HOST): str,
-        vol.Optional(ATTR_USERNAME, default=""): str,
-        vol.Optional(ATTR_PASSWORD, default=""): str,
-        vol.Optional(ATTR_CALLBACK_HOST, default=IP_ANY_V4): str,
-        vol.Optional(ATTR_CALLBACK_PORT, default=PORT_ANY): int,
+        vol.Optional(ATTR_USERNAME): str,
+        vol.Optional(ATTR_PASSWORD): str,
+        vol.Optional(ATTR_CALLBACK_HOST): str,
+        vol.Optional(ATTR_CALLBACK_PORT): int,
         vol.Optional(ATTR_TLS, default=DEFAULT_TLS): bool,
         vol.Optional(ATTR_VERIFY_TLS, default=False): bool,
         vol.Optional(ATTR_JSON_PORT): int,
diff --git a/custom_components/hahm/manifest.json b/custom_components/hahm/manifest.json
index a1eb3d1c..cb062a3b 100644
--- a/custom_components/hahm/manifest.json
+++ b/custom_components/hahm/manifest.json
@@ -11,5 +11,5 @@
   "dependencies": [],
   "codeowners": ["@danielperna84", "@SukramJ"],
   "iot_class": "local_push",
-  "version": "0.0.22.1"
+  "version": "0.0.22.2"
 }
diff --git a/custom_components/hahm/strings.json b/custom_components/hahm/strings.json
index f8b88d4b..c947e98e 100644
--- a/custom_components/hahm/strings.json
+++ b/custom_components/hahm/strings.json
@@ -7,15 +7,15 @@
         "description": "Please fill the required fields.",
         "data": {
           "instance_name": "Integration instance name",
-          "host": "CCU Hostname",
+          "host": "CCU Hostname/IP-Address",
           "username": "CCU Username",
           "password": "CCU Password",
-          "callback_ip": "Callback IP",
+          "callback_host": "Callback Hostname/IP-Address",
           "callback_port": "Callback XML-RPC Port",
-          "tls": "Use TLS",
-          "verify_tls": "Verify TLS connection",
-          "json_port": "Remote JSON-RPC Port",
-          "json_tls": "Use TLS for JSON"
+          "tls": "use TLS",
+          "verify_tls": "verify TLS connection",
+          "json_port": "JSON-RPC Port",
+          "json_tls": "use TLS for JSON"
         }
       },
       "interface": {
@@ -38,8 +38,8 @@
     "step": {
       "hahm_devices": {
         "data": {
-          "enable_virtual_channels": "Enable virtual channels",
-          "enable_sensors_for_system_variables": "Enable sensors for system variables"
+          "enable_virtual_channels": "enable virtual channels",
+          "enable_sensors_for_system_variables": "enable sensors for system variables"
         },
         "description": "Configure visibility of hahm device types",
         "title": "Hahm options"
diff --git a/custom_components/hahm/translations/de.json b/custom_components/hahm/translations/de.json
new file mode 100644
index 00000000..e94e00ad
--- /dev/null
+++ b/custom_components/hahm/translations/de.json
@@ -0,0 +1,61 @@
+{
+  "title": "Home-Assistant Integration für Homematic (IP)",
+  "config": {
+    "step": {
+      "user": {
+        "title": "Home-Assistant Integration für Homematic (IP)",
+        "description": "Bitte Pflichtfelder ausfüllen",
+        "data": {
+          "instance_name": "Instanzname der Integration",
+          "host": "CCU Hostname/IP-Adresse",
+          "username": "CCU Benutzername",
+          "password": "CCU Passwort",
+          "callback_host": "Callback Hostname/IP-Adresse",
+          "callback_port": "Callback XML-RPC Port",
+          "tls": "verwende TLS",
+          "verify_tls": "TLS Verbindung überprüfen",
+          "json_port": "JSON-RPC Port",
+          "json_tls": "verwende TLS für JSON"
+        }
+      },
+      "interface": {
+        "description": "Konfiguration der CCU Schnittstellen",
+        "data": {
+          "hmip_rf_enabled": "aktiviere Homematic IP",
+          "hmip_rf_port": "HmIP-RF Port",
+          "bidos_rf_enabled": "aktiviere Homematic (Bidcos-RF)",
+          "bidos_rf_port": "HM-RF Port",
+          "virtual_devices_enabled": "aktiviere Heizgruppen",
+          "virtual_devices_port": "Gruppen Port",
+          "virtual_devices_path": "Gruppen Path",
+          "hs485d_enabled": "aktiviere HS485D (HM-Wired)",
+          "hs485d_port": "HS485D Port"
+        }
+      }
+    }
+  },
+  "options": {
+    "step": {
+      "hahm_devices": {
+        "data": {
+          "enable_virtual_channels": "aktiviere virtuelle Gerätekanäle",
+          "enable_sensors_for_system_variables": "aktiviere Sensoren für Systemvariablen"
+        },
+        "description": "Konfiguriere die Sichtbarkeit von HAHM Geräten",
+        "title": "HAHM Optionen"
+      }
+    }
+  },
+  "device_automation": {
+    "trigger_type": {
+      "acoustic_alarm_active": "Akustischer Alarm aktiv",
+      "alarmstate": "Alarmstatus",
+      "dew_point_alarm": "Taupunkt-Alarm",
+      "humidity_alarm": "Luftfeuchtigkeit-Alarm",
+      "moisture_detected": "Feuchtigkeit erkannt",
+      "optical_alarm_active": "Optischer Alarm aktiv",
+      "smoke_detector_alarm_status": "Rauschmelder-Alarm",
+      "waterlevel_detected": "Wasserstand erkannt"
+    }
+  }
+}
diff --git a/custom_components/hahm/translations/en.json b/custom_components/hahm/translations/en.json
index f8b88d4b..c947e98e 100644
--- a/custom_components/hahm/translations/en.json
+++ b/custom_components/hahm/translations/en.json
@@ -7,15 +7,15 @@
         "description": "Please fill the required fields.",
         "data": {
           "instance_name": "Integration instance name",
-          "host": "CCU Hostname",
+          "host": "CCU Hostname/IP-Address",
           "username": "CCU Username",
           "password": "CCU Password",
-          "callback_ip": "Callback IP",
+          "callback_host": "Callback Hostname/IP-Address",
           "callback_port": "Callback XML-RPC Port",
-          "tls": "Use TLS",
-          "verify_tls": "Verify TLS connection",
-          "json_port": "Remote JSON-RPC Port",
-          "json_tls": "Use TLS for JSON"
+          "tls": "use TLS",
+          "verify_tls": "verify TLS connection",
+          "json_port": "JSON-RPC Port",
+          "json_tls": "use TLS for JSON"
         }
       },
       "interface": {
@@ -38,8 +38,8 @@
     "step": {
       "hahm_devices": {
         "data": {
-          "enable_virtual_channels": "Enable virtual channels",
-          "enable_sensors_for_system_variables": "Enable sensors for system variables"
+          "enable_virtual_channels": "enable virtual channels",
+          "enable_sensors_for_system_variables": "enable sensors for system variables"
         },
         "description": "Configure visibility of hahm device types",
         "title": "Hahm options"
diff --git a/custom_components/hahm/translations/nl.json b/custom_components/hahm/translations/nl.json
index 8c1769cf..91be16fd 100644
--- a/custom_components/hahm/translations/nl.json
+++ b/custom_components/hahm/translations/nl.json
@@ -10,7 +10,7 @@
           "host": "CCU Hostname",
           "username": "CCU Gebruikersnaam",
           "password": "CCU Wachtwoord",
-          "callback_ip": "Callback IP",
+          "callback_host": "Callback Hostname/IP",
           "callback_port": "Callback XML-RPC poort",
           "tls": "Gebruik TLS",
           "verify_tls": "Verifier TLS connection",