diff --git a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/locales/LabelGenerator.java b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/locales/LabelGenerator.java
index a1be4db1d0..dafe5f2799 100644
--- a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/locales/LabelGenerator.java
+++ b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/locales/LabelGenerator.java
@@ -50,15 +50,25 @@ public class LabelGenerator<T extends NamedStreamPipesEntity> {
 
   private T desc;
 
-  public LabelGenerator(T desc) {
+  private boolean replaceTitles;
+
+  public LabelGenerator(T desc, boolean replaceTitles) {
     this.desc = desc;
+    this.replaceTitles = replaceTitles;
+  }
+
+  public LabelGenerator(T desc) {
+    this(desc, true);
   }
 
   public T generateLabels() throws IOException {
     if (existsLocalesFile()) {
       Properties props = laodResourceAndMakeProperties();
-      desc.setName(getTitle(props, desc.getAppId()));
-      desc.setDescription(getDescription(props, desc.getAppId()));
+
+      if (replaceTitles) {
+        desc.setName(getTitle(props, desc.getAppId()));
+        desc.setDescription(getDescription(props, desc.getAppId()));
+      }
 
       if (isAdapter()) {
         ((AdapterDescription) desc).getConfig()
diff --git a/streampipes-extensions/streampipes-connect-adapters-iiot/pom.xml b/streampipes-extensions/streampipes-connect-adapters-iiot/pom.xml
index f2917f08b7..6abe50afd5 100644
--- a/streampipes-extensions/streampipes-connect-adapters-iiot/pom.xml
+++ b/streampipes-extensions/streampipes-connect-adapters-iiot/pom.xml
@@ -106,6 +106,11 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/IIoTAdaptersExtensionModuleExport.java b/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/IIoTAdaptersExtensionModuleExport.java
index 9714149241..49ff96c34f 100644
--- a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/IIoTAdaptersExtensionModuleExport.java
+++ b/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/IIoTAdaptersExtensionModuleExport.java
@@ -19,6 +19,7 @@
 package org.apache.streampipes.connect.iiot;
 
 import org.apache.streampipes.connect.iiot.adapters.iolink.IfmAlMqttAdapter;
+import org.apache.streampipes.connect.iiot.adapters.migrations.RosBridgeAdapterMigrationV1;
 import org.apache.streampipes.connect.iiot.adapters.ros.RosBridgeAdapter;
 import org.apache.streampipes.connect.iiot.adapters.simulator.machine.MachineDataSimulatorAdapter;
 import org.apache.streampipes.connect.iiot.protocol.stream.FileReplayAdapter;
@@ -52,6 +53,8 @@ public List<IStreamPipesPipelineElement<?>> pipelineElements() {
 
   @Override
   public List<IModelMigrator<?, ?>> migrators() {
-    return Collections.emptyList();
+    return List.of(
+            new RosBridgeAdapterMigrationV1()
+    );
   }
 }
diff --git a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/migrations/RosBridgeAdapterMigrationV1.java b/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/migrations/RosBridgeAdapterMigrationV1.java
new file mode 100644
index 0000000000..3d41e7fbf5
--- /dev/null
+++ b/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/migrations/RosBridgeAdapterMigrationV1.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.connect.iiot.adapters.migrations;
+
+import org.apache.streampipes.extensions.api.extractor.IStaticPropertyExtractor;
+import org.apache.streampipes.extensions.api.migration.IAdapterMigrator;
+import org.apache.streampipes.model.connect.adapter.AdapterDescription;
+import org.apache.streampipes.model.extensions.svcdiscovery.SpServiceTagPrefix;
+import org.apache.streampipes.model.migration.MigrationResult;
+import org.apache.streampipes.model.migration.ModelMigratorConfig;
+import org.apache.streampipes.model.staticproperty.FreeTextStaticProperty;
+import org.apache.streampipes.model.staticproperty.StaticProperty;
+import org.apache.streampipes.vocabulary.XSD;
+
+import static org.apache.streampipes.connect.iiot.adapters.ros.RosBridgeAdapter.ROS_PORT_KEY;
+
+public class RosBridgeAdapterMigrationV1 implements IAdapterMigrator {
+
+  @Override
+  public ModelMigratorConfig config() {
+    return new ModelMigratorConfig(
+      "org.apache.streampipes.connect.iiot.adapters.ros",
+      SpServiceTagPrefix.ADAPTER,
+      0,
+      1);
+  }
+
+  @Override
+  public MigrationResult<AdapterDescription> migrate(AdapterDescription element,
+                                                     IStaticPropertyExtractor extractor) throws RuntimeException {
+
+    var portProperty = extractPortProperty(element);
+    portProperty.setRequiredDatatype(XSD.INTEGER);
+
+    return MigrationResult.success(element);
+  }
+
+  protected FreeTextStaticProperty extractPortProperty(AdapterDescription adapterDescription) {
+    return (FreeTextStaticProperty) adapterDescription.getConfig().stream()
+                                                      .filter(this::isPortConfig)
+                                                      .findFirst()
+                                                      .orElseThrow();
+  }
+
+  private boolean isPortConfig(StaticProperty config) {
+    return config.getInternalName().equals(ROS_PORT_KEY);
+  }
+}
\ No newline at end of file
diff --git a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/ros/RosBridgeAdapter.java b/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/ros/RosBridgeAdapter.java
index 675461ecbe..9ff1d9ecb2 100644
--- a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/ros/RosBridgeAdapter.java
+++ b/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/ros/RosBridgeAdapter.java
@@ -60,9 +60,9 @@ public class RosBridgeAdapter implements StreamPipesAdapter, ResolvesContainerPr
 
   public static final String ID = "org.apache.streampipes.connect.iiot.adapters.ros";
 
-  private static final String ROS_HOST_KEY = "ROS_HOST_KEY";
-  private static final String ROS_PORT_KEY = "ROS_PORT_KEY";
-  private static final String TOPIC_KEY = "TOPIC_KEY";
+  public static final String ROS_HOST_KEY = "ROS_HOST_KEY";
+  public static final String ROS_PORT_KEY = "ROS_PORT_KEY";
+  public static final String TOPIC_KEY = "TOPIC_KEY";
 
   private String topic;
   private String host;
@@ -92,12 +92,12 @@ public List<Option> resolveOptions(String requestId,
 
   @Override
   public IAdapterConfiguration declareConfig() {
-    return AdapterConfigurationBuilder.create(ID, 0, RosBridgeAdapter::new)
+    return AdapterConfigurationBuilder.create(ID, 1, RosBridgeAdapter::new)
         .withLocales(Locales.EN)
         .withAssets(Assets.DOCUMENTATION, Assets.ICON)
         .withCategory(AdapterType.Manufacturing)
         .requiredTextParameter(Labels.withId(ROS_HOST_KEY))
-        .requiredTextParameter(Labels.withId(ROS_PORT_KEY))
+        .requiredIntegerParameter(Labels.withId(ROS_PORT_KEY))
         .requiredSingleValueSelectionFromContainer(
             Labels.withId(TOPIC_KEY), Arrays.asList(ROS_HOST_KEY, ROS_PORT_KEY))
         .buildConfiguration();
diff --git a/streampipes-extensions/streampipes-connect-adapters-iiot/src/test/java/org/apache/streampipes/connect/iiot/adapters/migrations/RosBridgeAdapterMigrationV1Test.java b/streampipes-extensions/streampipes-connect-adapters-iiot/src/test/java/org/apache/streampipes/connect/iiot/adapters/migrations/RosBridgeAdapterMigrationV1Test.java
new file mode 100644
index 0000000000..f6956da679
--- /dev/null
+++ b/streampipes-extensions/streampipes-connect-adapters-iiot/src/test/java/org/apache/streampipes/connect/iiot/adapters/migrations/RosBridgeAdapterMigrationV1Test.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.connect.iiot.adapters.migrations;
+
+import org.apache.streampipes.connect.iiot.adapters.migrations.config.RosBridgeAdapterVersionedConfig;
+import org.apache.streampipes.extensions.api.extractor.IStaticPropertyExtractor;
+import org.apache.streampipes.model.connect.adapter.AdapterDescription;
+import org.apache.streampipes.vocabulary.XSD;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.net.URI;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+
+
+public class RosBridgeAdapterMigrationV1Test {
+
+  private RosBridgeAdapterMigrationV1 migrationV1;
+
+  @Before
+  public void setUp() {
+    migrationV1 = new RosBridgeAdapterMigrationV1();
+  }
+
+  @Test
+  public void testMigrationV1(){
+    var rosBridgeAdapterDescriptionV0 = RosBridgeAdapterVersionedConfig.getRosBridgeAdapterDescriptionV0();
+    var extractorMock = mock(IStaticPropertyExtractor.class);
+
+    var rosBridgeAdapterDescriptionV1 = migrationV1.migrate(rosBridgeAdapterDescriptionV0 , extractorMock);
+
+    var typeOfPortProperty = getTypeOfPortProperty(rosBridgeAdapterDescriptionV1.element());
+    assertEquals(XSD.INTEGER, typeOfPortProperty);
+  }
+
+  private URI getTypeOfPortProperty(AdapterDescription adapterDescription) {
+    return migrationV1
+        .extractPortProperty(adapterDescription)
+        .getRequiredDatatype();
+  }
+
+}
\ No newline at end of file
diff --git a/streampipes-extensions/streampipes-connect-adapters-iiot/src/test/java/org/apache/streampipes/connect/iiot/adapters/migrations/config/RosBridgeAdapterVersionedConfig.java b/streampipes-extensions/streampipes-connect-adapters-iiot/src/test/java/org/apache/streampipes/connect/iiot/adapters/migrations/config/RosBridgeAdapterVersionedConfig.java
new file mode 100644
index 0000000000..ef07a13a9e
--- /dev/null
+++ b/streampipes-extensions/streampipes-connect-adapters-iiot/src/test/java/org/apache/streampipes/connect/iiot/adapters/migrations/config/RosBridgeAdapterVersionedConfig.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.connect.iiot.adapters.migrations.config;
+
+import org.apache.streampipes.connect.iiot.adapters.ros.RosBridgeAdapter;
+import org.apache.streampipes.model.AdapterType;
+import org.apache.streampipes.model.connect.adapter.AdapterDescription;
+import org.apache.streampipes.sdk.builder.adapter.AdapterConfigurationBuilder;
+import org.apache.streampipes.sdk.helpers.Labels;
+import org.apache.streampipes.sdk.helpers.Locales;
+import org.apache.streampipes.sdk.utils.Assets;
+
+import java.util.Arrays;
+
+import static org.apache.streampipes.connect.iiot.adapters.ros.RosBridgeAdapter.ID;
+import static org.apache.streampipes.connect.iiot.adapters.ros.RosBridgeAdapter.ROS_HOST_KEY;
+import static org.apache.streampipes.connect.iiot.adapters.ros.RosBridgeAdapter.ROS_PORT_KEY;
+import static org.apache.streampipes.connect.iiot.adapters.ros.RosBridgeAdapter.TOPIC_KEY;
+
+public class RosBridgeAdapterVersionedConfig {
+
+  public static AdapterDescription getRosBridgeAdapterDescriptionV0(){
+    return AdapterConfigurationBuilder.create(ID, 0, RosBridgeAdapter::new)
+      .withLocales(Locales.EN)
+      .withAssets(Assets.DOCUMENTATION, Assets.ICON)
+      .withCategory(AdapterType.Manufacturing)
+      .requiredTextParameter(Labels.withId(ROS_HOST_KEY))
+      .requiredTextParameter(Labels.withId(ROS_PORT_KEY))
+      .requiredSingleValueSelectionFromContainer(
+        Labels.withId(TOPIC_KEY), Arrays.asList(ROS_HOST_KEY, ROS_PORT_KEY))
+      .buildConfiguration().getAdapterDescription();
+  }
+
+  public static AdapterDescription getRosBridgeAdapterDescriptionV1(){
+    return AdapterConfigurationBuilder.create(ID, 1, RosBridgeAdapter::new)
+      .withLocales(Locales.EN)
+      .withAssets(Assets.DOCUMENTATION, Assets.ICON)
+      .withCategory(AdapterType.Manufacturing)
+      .requiredTextParameter(Labels.withId(ROS_HOST_KEY))
+      .requiredIntegerParameter(Labels.withId(ROS_PORT_KEY))
+      .requiredSingleValueSelectionFromContainer(
+        Labels.withId(TOPIC_KEY), Arrays.asList(ROS_HOST_KEY, ROS_PORT_KEY))
+      .buildConfiguration().getAdapterDescription();
+  }
+}
diff --git a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/OpcUaConnectorsModuleExport.java b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/OpcUaConnectorsModuleExport.java
index 8967148f6c..d551d979d0 100644
--- a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/OpcUaConnectorsModuleExport.java
+++ b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/OpcUaConnectorsModuleExport.java
@@ -24,6 +24,7 @@
 import org.apache.streampipes.extensions.api.pe.IStreamPipesPipelineElement;
 import org.apache.streampipes.extensions.connectors.opcua.adapter.OpcUaAdapter;
 import org.apache.streampipes.extensions.connectors.opcua.migration.OpcUaAdapterMigrationV1;
+import org.apache.streampipes.extensions.connectors.opcua.migration.OpcUaAdapterMigrationV2;
 import org.apache.streampipes.extensions.connectors.opcua.sink.OpcUaSink;
 
 import java.util.List;
@@ -46,7 +47,8 @@ public List<IStreamPipesPipelineElement<?>> pipelineElements() {
   @Override
   public List<IModelMigrator<?, ?>> migrators() {
     return List.of(
-        new OpcUaAdapterMigrationV1()
+        new OpcUaAdapterMigrationV1(),
+        new OpcUaAdapterMigrationV2()
     );
   }
 }
diff --git a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/adapter/OpcUaAdapter.java b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/adapter/OpcUaAdapter.java
index c4e397d718..4b93ade90a 100644
--- a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/adapter/OpcUaAdapter.java
+++ b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/adapter/OpcUaAdapter.java
@@ -231,7 +231,7 @@ public StaticProperty resolveConfiguration(String staticPropertyInternalName,
 
   @Override
   public IAdapterConfiguration declareConfig() {
-    var builder = AdapterConfigurationBuilder.create(ID, 1, OpcUaAdapter::new)
+    var builder = AdapterConfigurationBuilder.create(ID, 2, OpcUaAdapter::new)
         .withAssets(Assets.DOCUMENTATION, Assets.ICON)
         .withLocales(Locales.EN)
         .withCategory(AdapterType.Generic, AdapterType.Manufacturing)
diff --git a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/config/SharedUserConfiguration.java b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/config/SharedUserConfiguration.java
index a5691da311..cb95919174 100644
--- a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/config/SharedUserConfiguration.java
+++ b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/config/SharedUserConfiguration.java
@@ -69,7 +69,7 @@ public static void appendSharedOpcUaConfig(AbstractConfigurablePipelineElementBu
                     Labels.withId(HOST_PORT),
                     StaticProperties.stringFreeTextProperty(
                         Labels.withId(OPC_SERVER_HOST)),
-                    StaticProperties.stringFreeTextProperty(
+                    StaticProperties.integerFreeTextProperty(
                         Labels.withId(OPC_SERVER_PORT))
                 ))
         )
diff --git a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/migration/OpcUaAdapterMigrationV2.java b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/migration/OpcUaAdapterMigrationV2.java
new file mode 100644
index 0000000000..382d1e3514
--- /dev/null
+++ b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/migration/OpcUaAdapterMigrationV2.java
@@ -0,0 +1,99 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.extensions.connectors.opcua.migration;
+
+import org.apache.streampipes.extensions.api.extractor.IStaticPropertyExtractor;
+import org.apache.streampipes.extensions.api.migration.IAdapterMigrator;
+import org.apache.streampipes.model.connect.adapter.AdapterDescription;
+import org.apache.streampipes.model.extensions.svcdiscovery.SpServiceTagPrefix;
+import org.apache.streampipes.model.migration.MigrationResult;
+import org.apache.streampipes.model.migration.ModelMigratorConfig;
+import org.apache.streampipes.model.staticproperty.FreeTextStaticProperty;
+import org.apache.streampipes.model.staticproperty.StaticPropertyAlternatives;
+import org.apache.streampipes.model.staticproperty.StaticPropertyGroup;
+import org.apache.streampipes.vocabulary.XSD;
+
+import static org.apache.streampipes.extensions.connectors.opcua.utils.OpcUaLabels.OPC_HOST;
+import static org.apache.streampipes.extensions.connectors.opcua.utils.OpcUaLabels.OPC_HOST_OR_URL;
+import static org.apache.streampipes.extensions.connectors.opcua.utils.OpcUaLabels.OPC_SERVER_PORT;
+
+
+public class OpcUaAdapterMigrationV2 implements IAdapterMigrator {
+  @Override
+  public ModelMigratorConfig config() {
+    return new ModelMigratorConfig(
+        "org.apache.streampipes.connect.iiot.adapters.opcua",
+        SpServiceTagPrefix.ADAPTER,
+        1,
+        2
+    );
+  }
+
+  @Override
+  public MigrationResult<AdapterDescription> migrate(
+      AdapterDescription element,
+      IStaticPropertyExtractor extractor
+  ) throws RuntimeException {
+
+    var portStaticProperty = extractPortProperty(element);
+    portStaticProperty.setRequiredDatatype(XSD.INTEGER);
+
+    return MigrationResult.success(element);
+  }
+
+  /**
+   * This method searches for the static property of the port definition
+   */
+  protected FreeTextStaticProperty extractPortProperty(AdapterDescription adapterDescription) {
+    var staticPropertyAlternatives = getOpcHostOrUrl(adapterDescription);
+    var staticPropertyGroup = getOpcHost(staticPropertyAlternatives);
+    return getOpcServerPort(staticPropertyGroup);
+  }
+
+  private StaticPropertyAlternatives getOpcHostOrUrl(AdapterDescription adapterDescription) {
+    return (StaticPropertyAlternatives) adapterDescription
+        .getConfig()
+        .stream()
+        .filter(config -> config.getInternalName()
+                                .equals(OPC_HOST_OR_URL.name()))
+        .findFirst()
+        .orElseThrow();
+  }
+
+  private StaticPropertyGroup getOpcHost(StaticPropertyAlternatives staticPropertyAlternatives) {
+    return (StaticPropertyGroup) staticPropertyAlternatives
+        .getAlternatives()
+        .stream()
+        .filter(alternative -> alternative.getInternalName()
+                                          .equals(OPC_HOST.name()))
+        .findFirst()
+        .orElseThrow()
+        .getStaticProperty();
+  }
+
+  private FreeTextStaticProperty getOpcServerPort(StaticPropertyGroup staticPropertyGroup) {
+    return (FreeTextStaticProperty) staticPropertyGroup
+        .getStaticProperties()
+        .stream()
+        .filter(property -> property.getInternalName()
+                                    .equals(OPC_SERVER_PORT.name()))
+        .findFirst()
+        .orElseThrow();
+  }
+}
diff --git a/streampipes-extensions/streampipes-connectors-opcua/src/test/java/org/apache/streampipes/extensions/connectors/opcua/migration/OpcUaAdapterMigrationV2Test.java b/streampipes-extensions/streampipes-connectors-opcua/src/test/java/org/apache/streampipes/extensions/connectors/opcua/migration/OpcUaAdapterMigrationV2Test.java
new file mode 100644
index 0000000000..2b7581b3c0
--- /dev/null
+++ b/streampipes-extensions/streampipes-connectors-opcua/src/test/java/org/apache/streampipes/extensions/connectors/opcua/migration/OpcUaAdapterMigrationV2Test.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.extensions.connectors.opcua.migration;
+
+import org.apache.streampipes.extensions.api.extractor.IStaticPropertyExtractor;
+import org.apache.streampipes.extensions.connectors.opcua.migration.config.OpcUaAdapterVersionedConfig;
+import org.apache.streampipes.model.connect.adapter.AdapterDescription;
+import org.apache.streampipes.vocabulary.XSD;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.net.URI;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+
+public class OpcUaAdapterMigrationV2Test {
+
+  private OpcUaAdapterMigrationV2 migrationV2;
+
+  @Before
+  public void setUp() {
+    migrationV2 = new OpcUaAdapterMigrationV2();
+  }
+
+  @Test
+  public void testOPCUAAdapterMigrationV2() {
+    var adapterDescriptionV1 = OpcUaAdapterVersionedConfig.getOpcUaAdapterDescriptionV1();
+    var extractorMock = mock(IStaticPropertyExtractor.class);
+
+    var adapterDescriptionV2 = migrationV2.migrate(adapterDescriptionV1, extractorMock)
+                                          .element();
+
+    assertEquals(XSD.INTEGER, getTypeOfPortProperty(adapterDescriptionV2));
+  }
+
+  private URI getTypeOfPortProperty(AdapterDescription adapterDescriptionV2) {
+    return migrationV2
+        .extractPortProperty(adapterDescriptionV2)
+        .getRequiredDatatype();
+  }
+}
\ No newline at end of file
diff --git a/streampipes-extensions/streampipes-connectors-opcua/src/test/java/org/apache/streampipes/extensions/connectors/opcua/migration/config/OpcUaAdapterVersionedConfig.java b/streampipes-extensions/streampipes-connectors-opcua/src/test/java/org/apache/streampipes/extensions/connectors/opcua/migration/config/OpcUaAdapterVersionedConfig.java
new file mode 100644
index 0000000000..fbf1514957
--- /dev/null
+++ b/streampipes-extensions/streampipes-connectors-opcua/src/test/java/org/apache/streampipes/extensions/connectors/opcua/migration/config/OpcUaAdapterVersionedConfig.java
@@ -0,0 +1,102 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.extensions.connectors.opcua.migration.config;
+
+import org.apache.streampipes.extensions.connectors.opcua.adapter.OpcUaAdapter;
+import org.apache.streampipes.model.AdapterType;
+import org.apache.streampipes.model.connect.adapter.AdapterDescription;
+import org.apache.streampipes.sdk.StaticProperties;
+import org.apache.streampipes.sdk.builder.adapter.AdapterConfigurationBuilder;
+import org.apache.streampipes.sdk.helpers.Alternatives;
+import org.apache.streampipes.sdk.helpers.Labels;
+import org.apache.streampipes.sdk.helpers.Locales;
+import org.apache.streampipes.sdk.utils.Assets;
+
+import java.util.List;
+
+import static org.apache.streampipes.extensions.connectors.opcua.adapter.OpcUaAdapter.ID;
+import static org.apache.streampipes.extensions.connectors.opcua.utils.OpcUaLabels.ACCESS_MODE;
+import static org.apache.streampipes.extensions.connectors.opcua.utils.OpcUaLabels.ADAPTER_TYPE;
+import static org.apache.streampipes.extensions.connectors.opcua.utils.OpcUaLabels.AVAILABLE_NODES;
+import static org.apache.streampipes.extensions.connectors.opcua.utils.OpcUaLabels.HOST_PORT;
+import static org.apache.streampipes.extensions.connectors.opcua.utils.OpcUaLabels.OPC_HOST;
+import static org.apache.streampipes.extensions.connectors.opcua.utils.OpcUaLabels.OPC_HOST_OR_URL;
+import static org.apache.streampipes.extensions.connectors.opcua.utils.OpcUaLabels.OPC_SERVER_HOST;
+import static org.apache.streampipes.extensions.connectors.opcua.utils.OpcUaLabels.OPC_SERVER_PORT;
+import static org.apache.streampipes.extensions.connectors.opcua.utils.OpcUaLabels.OPC_SERVER_URL;
+import static org.apache.streampipes.extensions.connectors.opcua.utils.OpcUaLabels.OPC_URL;
+import static org.apache.streampipes.extensions.connectors.opcua.utils.OpcUaLabels.PASSWORD;
+import static org.apache.streampipes.extensions.connectors.opcua.utils.OpcUaLabels.PULLING_INTERVAL;
+import static org.apache.streampipes.extensions.connectors.opcua.utils.OpcUaLabels.PULL_MODE;
+import static org.apache.streampipes.extensions.connectors.opcua.utils.OpcUaLabels.SUBSCRIPTION_MODE;
+import static org.apache.streampipes.extensions.connectors.opcua.utils.OpcUaLabels.UNAUTHENTICATED;
+import static org.apache.streampipes.extensions.connectors.opcua.utils.OpcUaLabels.USERNAME;
+import static org.apache.streampipes.extensions.connectors.opcua.utils.OpcUaLabels.USERNAME_GROUP;
+
+public class OpcUaAdapterVersionedConfig {
+
+  public static AdapterDescription getOpcUaAdapterDescriptionV1(){
+    var builder = AdapterConfigurationBuilder.create(ID, 1, OpcUaAdapter::new)
+        .withAssets(Assets.DOCUMENTATION, Assets.ICON)
+        .withLocales(Locales.EN)
+        .withCategory(AdapterType.Generic, AdapterType.Manufacturing)
+        .requiredAlternatives(Labels.withId(ADAPTER_TYPE),
+        Alternatives.from(Labels.withId(PULL_MODE),
+          StaticProperties.integerFreeTextProperty(
+            Labels.withId(PULLING_INTERVAL))),
+        Alternatives.from(Labels.withId(SUBSCRIPTION_MODE)));
+    var dependsOn = List.of(
+        ADAPTER_TYPE.name(),
+        ACCESS_MODE.name(),
+        OPC_HOST_OR_URL.name());
+    builder
+        .requiredAlternatives(Labels.withId(ACCESS_MODE),
+        Alternatives.from(Labels.withId(UNAUTHENTICATED)),
+        Alternatives.from(Labels.withId(USERNAME_GROUP),
+          StaticProperties.group(
+            Labels.withId(USERNAME_GROUP),
+            StaticProperties.stringFreeTextProperty(
+              Labels.withId(USERNAME)),
+            StaticProperties.secretValue(Labels.withId(PASSWORD))
+          ))
+      )
+        .requiredAlternatives(Labels.withId(OPC_HOST_OR_URL),
+        Alternatives.from(
+          Labels.withId(OPC_URL),
+          StaticProperties.stringFreeTextProperty(
+            Labels.withId(OPC_SERVER_URL), "opc.tcp://localhost:4840"))
+        ,
+        Alternatives.from(Labels.withId(OPC_HOST),
+          StaticProperties.group(
+            Labels.withId(HOST_PORT),
+            StaticProperties.stringFreeTextProperty(
+              Labels.withId(OPC_SERVER_HOST)),
+            StaticProperties.stringFreeTextProperty(
+              Labels.withId(OPC_SERVER_PORT))
+          ))
+      )
+        .requiredRuntimeResolvableTreeInput(
+          Labels.withId(AVAILABLE_NODES.name()),
+          dependsOn,
+          true,
+          true
+        );
+    return builder.buildConfiguration().getAdapterDescription();
+  }
+}
diff --git a/streampipes-extensions/streampipes-connectors-plc/pom.xml b/streampipes-extensions/streampipes-connectors-plc/pom.xml
index 2dd11589e7..5db1ad0263 100644
--- a/streampipes-extensions/streampipes-connectors-plc/pom.xml
+++ b/streampipes-extensions/streampipes-connectors-plc/pom.xml
@@ -71,6 +71,12 @@
             <scope>runtime</scope>
         </dependency>
 
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/PlcConnectorsModuleExport.java b/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/PlcConnectorsModuleExport.java
index b632d9c5b5..b63ad2bd2c 100644
--- a/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/PlcConnectorsModuleExport.java
+++ b/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/PlcConnectorsModuleExport.java
@@ -22,6 +22,7 @@
 import org.apache.streampipes.extensions.api.declarer.IExtensionModuleExport;
 import org.apache.streampipes.extensions.api.migration.IModelMigrator;
 import org.apache.streampipes.extensions.api.pe.IStreamPipesPipelineElement;
+import org.apache.streampipes.extensions.connectors.plc.adapter.migration.Plc4xModbusAdapterMigrationV1;
 import org.apache.streampipes.extensions.connectors.plc.adapter.migration.Plc4xS7AdapterMigrationV1;
 import org.apache.streampipes.extensions.connectors.plc.adapter.modbus.Plc4xModbusAdapter;
 import org.apache.streampipes.extensions.connectors.plc.adapter.s7.Plc4xS7Adapter;
@@ -46,7 +47,8 @@ public List<IStreamPipesPipelineElement<?>> pipelineElements() {
   @Override
   public List<IModelMigrator<?, ?>> migrators() {
     return List.of(
-        new Plc4xS7AdapterMigrationV1()
+        new Plc4xS7AdapterMigrationV1(),
+        new Plc4xModbusAdapterMigrationV1()
     );
   }
 }
diff --git a/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/migration/Plc4xModbusAdapterMigrationV1.java b/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/migration/Plc4xModbusAdapterMigrationV1.java
new file mode 100644
index 0000000000..660de692e8
--- /dev/null
+++ b/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/migration/Plc4xModbusAdapterMigrationV1.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.extensions.connectors.plc.adapter.migration;
+
+import org.apache.streampipes.extensions.api.extractor.IStaticPropertyExtractor;
+import org.apache.streampipes.extensions.api.migration.IAdapterMigrator;
+import org.apache.streampipes.model.connect.adapter.AdapterDescription;
+import org.apache.streampipes.model.extensions.svcdiscovery.SpServiceTagPrefix;
+import org.apache.streampipes.model.migration.MigrationResult;
+import org.apache.streampipes.model.migration.ModelMigratorConfig;
+import org.apache.streampipes.model.staticproperty.FreeTextStaticProperty;
+import org.apache.streampipes.model.staticproperty.StaticProperty;
+import org.apache.streampipes.vocabulary.XSD;
+
+import static org.apache.streampipes.extensions.connectors.plc.adapter.modbus.Plc4xModbusAdapter.PLC_PORT;
+
+public class Plc4xModbusAdapterMigrationV1 implements IAdapterMigrator {
+  @Override
+  public ModelMigratorConfig config() {
+    return new ModelMigratorConfig(
+      "org.apache.streampipes.connect.iiot.adapters.plc4x.modbus",
+      SpServiceTagPrefix.ADAPTER,
+      0,
+      1
+    );
+  }
+
+  @Override
+  public MigrationResult<AdapterDescription> migrate(AdapterDescription element,
+                                                     IStaticPropertyExtractor extractor) throws RuntimeException {
+
+    var portProperty = extractPortProperty(element);
+    portProperty.setRequiredDatatype(XSD.INTEGER);
+
+    return MigrationResult.success(element);
+  }
+
+  protected FreeTextStaticProperty extractPortProperty(AdapterDescription adapterDescription) {
+    return (FreeTextStaticProperty) adapterDescription.getConfig().stream()
+        .filter(this::isPortConfig)
+        .findFirst()
+        .orElseThrow();
+  }
+
+  private boolean isPortConfig(StaticProperty config) {
+    return config.getInternalName().equals(PLC_PORT);
+  }
+}
diff --git a/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/modbus/Plc4xModbusAdapter.java b/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/modbus/Plc4xModbusAdapter.java
index 1487c77ae7..c9815e6892 100644
--- a/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/modbus/Plc4xModbusAdapter.java
+++ b/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/modbus/Plc4xModbusAdapter.java
@@ -76,14 +76,14 @@ public class Plc4xModbusAdapter implements StreamPipesAdapter, IPullAdapter {
   /**
    * Keys of user configuration parameters
    */
-  private static final String PLC_IP = "plc_ip";
-  private static final String PLC_PORT = "plc_port";
-
-  private static final String PLC_NODES = "plc_nodes";
-  private static final String PLC_NODE_ID = "plc_node_id";
-  private static final String PLC_NODE_RUNTIME_NAME = "plc_node_runtime_name";
-  private static final String PLC_NODE_ADDRESS = "plc_node_address";
-  private static final String PLC_NODE_TYPE = "plc_node_type";
+  public static final String PLC_IP = "plc_ip";
+  public static final String PLC_PORT = "plc_port";
+
+  public static final String PLC_NODES = "plc_nodes";
+  public static final String PLC_NODE_ID = "plc_node_id";
+  public static final String PLC_NODE_RUNTIME_NAME = "plc_node_runtime_name";
+  public static final String PLC_NODE_ADDRESS = "plc_node_address";
+  public static final String PLC_NODE_TYPE = "plc_node_type";
   private static final String CONFIGURE = "configure";
 
   /**
@@ -273,11 +273,11 @@ public PollingSettings getPollingInterval() {
    */
   @Override
   public IAdapterConfiguration declareConfig() {
-    return AdapterConfigurationBuilder.create(ID, 0, Plc4xModbusAdapter::new)
+    return AdapterConfigurationBuilder.create(ID, 1, Plc4xModbusAdapter::new)
         .withLocales(Locales.EN)
         .withAssets(Assets.DOCUMENTATION, Assets.ICON)
         .withCategory(AdapterType.Manufacturing)
-        .requiredTextParameter(Labels.withId(PLC_IP)).requiredTextParameter(Labels.withId(PLC_PORT))
+        .requiredTextParameter(Labels.withId(PLC_IP)).requiredIntegerParameter(Labels.withId(PLC_PORT))
         .requiredTextParameter(Labels.withId(PLC_NODE_ID)).requiredCollection(Labels.withId(PLC_NODES),
             StaticProperties.stringFreeTextProperty(Labels.withId(PLC_NODE_RUNTIME_NAME)),
             StaticProperties.integerFreeTextProperty(Labels.withId(PLC_NODE_ADDRESS)),
diff --git a/streampipes-extensions/streampipes-connectors-plc/src/test/java/org/apache/streampipes/extensions/connectors/plc/adapter/migration/Plc4xModbusAdapterMigrationTest.java b/streampipes-extensions/streampipes-connectors-plc/src/test/java/org/apache/streampipes/extensions/connectors/plc/adapter/migration/Plc4xModbusAdapterMigrationTest.java
new file mode 100644
index 0000000000..fcb7708a5c
--- /dev/null
+++ b/streampipes-extensions/streampipes-connectors-plc/src/test/java/org/apache/streampipes/extensions/connectors/plc/adapter/migration/Plc4xModbusAdapterMigrationTest.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.extensions.connectors.plc.adapter.migration;
+
+import org.apache.streampipes.extensions.api.extractor.IStaticPropertyExtractor;
+import org.apache.streampipes.extensions.connectors.plc.adapter.migration.config.Plc4xModbusAdapterVersionedConfig;
+import org.apache.streampipes.model.connect.adapter.AdapterDescription;
+import org.apache.streampipes.vocabulary.XSD;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.net.URI;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+
+public class Plc4xModbusAdapterMigrationTest {
+
+  private Plc4xModbusAdapterMigrationV1 migrationV1;
+
+  @Before
+  public void setUp() {
+    migrationV1 = new Plc4xModbusAdapterMigrationV1();
+  }
+
+  @Test
+  public void testMigrationV1() {
+    var modbusAdapterDescriptionV0 = Plc4xModbusAdapterVersionedConfig.getPlc4xModbusAdapterDescriptionV0();
+    var extractorMock = mock(IStaticPropertyExtractor.class);
+
+    var modbusAdapterDescriptionV1 = migrationV1.migrate(modbusAdapterDescriptionV0, extractorMock);
+
+    var typeOfPortProperty = getTypeOfPortProperty(modbusAdapterDescriptionV1.element());
+    assertEquals(XSD.INTEGER, typeOfPortProperty);
+  }
+
+  private URI getTypeOfPortProperty(AdapterDescription adapterDescription) {
+    return migrationV1
+        .extractPortProperty(adapterDescription)
+        .getRequiredDatatype();
+  }
+
+}
\ No newline at end of file
diff --git a/streampipes-extensions/streampipes-connectors-plc/src/test/java/org/apache/streampipes/extensions/connectors/plc/adapter/migration/config/Plc4xModbusAdapterVersionedConfig.java b/streampipes-extensions/streampipes-connectors-plc/src/test/java/org/apache/streampipes/extensions/connectors/plc/adapter/migration/config/Plc4xModbusAdapterVersionedConfig.java
new file mode 100644
index 0000000000..11509f5d5d
--- /dev/null
+++ b/streampipes-extensions/streampipes-connectors-plc/src/test/java/org/apache/streampipes/extensions/connectors/plc/adapter/migration/config/Plc4xModbusAdapterVersionedConfig.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.extensions.connectors.plc.adapter.migration.config;
+
+import org.apache.streampipes.extensions.connectors.plc.adapter.modbus.Plc4xModbusAdapter;
+import org.apache.streampipes.model.AdapterType;
+import org.apache.streampipes.model.connect.adapter.AdapterDescription;
+import org.apache.streampipes.sdk.StaticProperties;
+import org.apache.streampipes.sdk.builder.adapter.AdapterConfigurationBuilder;
+import org.apache.streampipes.sdk.helpers.Labels;
+import org.apache.streampipes.sdk.helpers.Locales;
+import org.apache.streampipes.sdk.helpers.Options;
+import org.apache.streampipes.sdk.utils.Assets;
+
+import static org.apache.streampipes.extensions.connectors.plc.adapter.modbus.Plc4xModbusAdapter.ID;
+import static org.apache.streampipes.extensions.connectors.plc.adapter.modbus.Plc4xModbusAdapter.PLC_IP;
+import static org.apache.streampipes.extensions.connectors.plc.adapter.modbus.Plc4xModbusAdapter.PLC_NODES;
+import static org.apache.streampipes.extensions.connectors.plc.adapter.modbus.Plc4xModbusAdapter.PLC_NODE_ADDRESS;
+import static org.apache.streampipes.extensions.connectors.plc.adapter.modbus.Plc4xModbusAdapter.PLC_NODE_ID;
+import static org.apache.streampipes.extensions.connectors.plc.adapter.modbus.Plc4xModbusAdapter.PLC_NODE_RUNTIME_NAME;
+import static org.apache.streampipes.extensions.connectors.plc.adapter.modbus.Plc4xModbusAdapter.PLC_NODE_TYPE;
+import static org.apache.streampipes.extensions.connectors.plc.adapter.modbus.Plc4xModbusAdapter.PLC_PORT;
+
+public class Plc4xModbusAdapterVersionedConfig {
+
+  public static AdapterDescription getPlc4xModbusAdapterDescriptionV0() {
+    return AdapterConfigurationBuilder.create(ID, 0, Plc4xModbusAdapter::new)
+                                      .withLocales(Locales.EN)
+                                      .withAssets(Assets.DOCUMENTATION, Assets.ICON)
+                                      .withCategory(AdapterType.Manufacturing)
+                                      .requiredTextParameter(Labels.withId(PLC_IP))
+                                      .requiredTextParameter(Labels.withId(PLC_PORT))
+                                      .requiredTextParameter(Labels.withId(PLC_NODE_ID))
+                                      .requiredCollection(
+                                          Labels.withId(PLC_NODES),
+                                          StaticProperties.stringFreeTextProperty(Labels.withId(PLC_NODE_RUNTIME_NAME)),
+                                          StaticProperties.integerFreeTextProperty(Labels.withId(PLC_NODE_ADDRESS)),
+                                          StaticProperties.singleValueSelection(
+                                              Labels.withId(PLC_NODE_TYPE),
+                                              Options.from("DiscreteInput", "Coil", "InputRegister", "HoldingRegister")
+                                          )
+                                      )
+                                      .buildConfiguration()
+                                      .getAdapterDescription();
+  }
+
+}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/FreeTextStaticProperty.java b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/FreeTextStaticProperty.java
index 26eba23b33..6dda7dbe0c 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/FreeTextStaticProperty.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/FreeTextStaticProperty.java
@@ -19,6 +19,7 @@
 package org.apache.streampipes.model.staticproperty;
 
 import java.net.URI;
+import java.util.Objects;
 
 public class FreeTextStaticProperty extends StaticProperty {
 
@@ -67,7 +68,7 @@ public FreeTextStaticProperty(String internalName, String label, String descript
 
   public FreeTextStaticProperty(String internalName, String label, String description, URI type) {
     super(StaticPropertyType.FreeTextStaticProperty, internalName, label, description);
-    this.requiredDomainProperty = type;
+    this.requiredDatatype = type;
   }
 
   public FreeTextStaticProperty(String internalName, String label, String description, URI type, String mapsTo) {
@@ -163,4 +164,58 @@ public void setMapsTo(String mapsTo) {
   public void accept(StaticPropertyVisitor visitor) {
     visitor.visit(this);
   }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof FreeTextStaticProperty that)) {
+      return false;
+    }
+    if (!super.equals(o)) {
+      return false;
+    }
+
+    if (multiLine != that.multiLine) {
+      return false;
+    }
+    if (htmlAllowed != that.htmlAllowed) {
+      return false;
+    }
+    if (htmlFontFormat != that.htmlFontFormat) {
+      return false;
+    }
+    if (placeholdersSupported != that.placeholdersSupported) {
+      return false;
+    }
+    if (!Objects.equals(value, that.value)) {
+      return false;
+    }
+    if (!Objects.equals(requiredDatatype, that.requiredDatatype)) {
+      return false;
+    }
+    if (!Objects.equals(requiredDomainProperty, that.requiredDomainProperty)) {
+      return false;
+    }
+    if (!Objects.equals(mapsTo, that.mapsTo)) {
+      return false;
+    }
+    return Objects.equals(valueSpecification, that.valueSpecification);
+  }
+
+  @Override
+  public int hashCode() {
+    int result = super.hashCode();
+    result = 31 * result + (value != null ? value.hashCode() : 0);
+    result = 31 * result + (requiredDatatype != null ? requiredDatatype.hashCode() : 0);
+    result = 31 * result + (requiredDomainProperty != null ? requiredDomainProperty.hashCode() : 0);
+    result = 31 * result + (mapsTo != null ? mapsTo.hashCode() : 0);
+    result = 31 * result + (multiLine ? 1 : 0);
+    result = 31 * result + (htmlAllowed ? 1 : 0);
+    result = 31 * result + (htmlFontFormat ? 1 : 0);
+    result = 31 * result + (placeholdersSupported ? 1 : 0);
+    result = 31 * result + (valueSpecification != null ? valueSpecification.hashCode() : 0);
+    return result;
+  }
 }
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticProperty.java b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticProperty.java
index 6b8e406827..0c952061f7 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticProperty.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticProperty.java
@@ -23,6 +23,8 @@
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
+import java.util.Objects;
+
 @JsonSubTypes({
     @JsonSubTypes.Type(AnyStaticProperty.class),
     @JsonSubTypes.Type(CodeInputStaticProperty.class),
@@ -150,4 +152,45 @@ public <T extends StaticProperty> T as(Class<T> targetClass) {
 
   public abstract void accept(StaticPropertyVisitor visitor);
 
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof StaticProperty that)) {
+      return false;
+    }
+
+    if (valueRequired != that.valueRequired) {
+      return false;
+    }
+    if (index != that.index) {
+      return false;
+    }
+    if (predefined != that.predefined) {
+      return false;
+    }
+    if (staticPropertyType != that.staticPropertyType) {
+      return false;
+    }
+    if (!Objects.equals(label, that.label)) {
+      return false;
+    }
+    if (!Objects.equals(description, that.description)) {
+      return false;
+    }
+    return Objects.equals(internalName, that.internalName);
+  }
+
+  @Override
+  public int hashCode() {
+    int result = (valueRequired ? 1 : 0);
+    result = 31 * result + (staticPropertyType != null ? staticPropertyType.hashCode() : 0);
+    result = 31 * result + index;
+    result = 31 * result + (label != null ? label.hashCode() : 0);
+    result = 31 * result + (description != null ? description.hashCode() : 0);
+    result = 31 * result + (internalName != null ? internalName.hashCode() : 0);
+    result = 31 * result + (predefined ? 1 : 0);
+    return result;
+  }
 }
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticPropertyAlternative.java b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticPropertyAlternative.java
index 0e76e7493d..78e3d53001 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticPropertyAlternative.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticPropertyAlternative.java
@@ -20,6 +20,8 @@
 import org.apache.streampipes.model.util.Cloner;
 import org.apache.streampipes.model.util.ElementIdGenerator;
 
+import java.util.Objects;
+
 public class StaticPropertyAlternative extends StaticProperty {
 
   private String elementId;
@@ -76,4 +78,37 @@ public void setStaticProperty(StaticProperty staticProperty) {
   public void accept(StaticPropertyVisitor visitor) {
     visitor.visit(this);
   }
+
+  /**
+   * equals() excludes elementId
+   */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof StaticPropertyAlternative that)) {
+      return false;
+    }
+    if (!super.equals(o)) {
+      return false;
+    }
+
+    if (selected != that.selected) {
+      return false;
+    }
+
+    return Objects.equals(staticProperty, that.staticProperty);
+  }
+
+  /**
+   * hashCode() excludes elementId
+   */
+  @Override
+  public int hashCode() {
+    int result = super.hashCode();
+    result = 31 * result + (selected ? 1 : 0);
+    result = 31 * result + (staticProperty != null ? staticProperty.hashCode() : 0);
+    return result;
+  }
 }
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticPropertyAlternatives.java b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticPropertyAlternatives.java
index 28a3c3d486..9f76dc3d08 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticPropertyAlternatives.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticPropertyAlternatives.java
@@ -54,4 +54,36 @@ public void setAlternatives(List<StaticPropertyAlternative> alternatives) {
   public void accept(StaticPropertyVisitor visitor) {
     visitor.visit(this);
   }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof StaticPropertyAlternatives that)) {
+      return false;
+    }
+    if (!super.equals(o)) {
+      return false;
+    }
+
+    if (!(this.alternatives.size() == that.alternatives.size())) {
+      return false;
+    }
+
+    for (var i = 0; i < alternatives.size(); i++){
+      if (!alternatives.get(i).equals(that.alternatives.get(i))){
+        return false;
+      }
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    int result = super.hashCode();
+    result = 31 * result + (alternatives != null ? alternatives.hashCode() : 0);
+    return result;
+  }
 }
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticPropertyGroup.java b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticPropertyGroup.java
index bbf1d52dbc..c81ba0b407 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticPropertyGroup.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticPropertyGroup.java
@@ -20,6 +20,7 @@
 import org.apache.streampipes.model.util.Cloner;
 
 import java.util.List;
+import java.util.Objects;
 
 public class StaticPropertyGroup extends StaticProperty {
 
@@ -83,4 +84,41 @@ public void setHorizontalRendering(boolean horizontalRendering) {
   public void accept(StaticPropertyVisitor visitor) {
     visitor.visit(this);
   }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof StaticPropertyGroup that)) {
+      return false;
+    }
+    if (!super.equals(o)) {
+      return false;
+    }
+
+    if (horizontalRendering != that.horizontalRendering) {
+      return false;
+    }
+
+    if (!(this.staticProperties.size() == that.staticProperties.size())) {
+      return false;
+    }
+
+    for (var i = 0; i < staticProperties.size(); i++){
+      if (!staticProperties.get(i).equals(that.staticProperties.get(i))){
+        return false;
+      }
+    }
+    return Objects.equals(showLabel, that.showLabel);
+  }
+
+  @Override
+  public int hashCode() {
+    int result = super.hashCode();
+    result = 31 * result + (staticProperties != null ? staticProperties.hashCode() : 0);
+    result = 31 * result + (showLabel != null ? showLabel.hashCode() : 0);
+    result = 31 * result + (horizontalRendering ? 1 : 0);
+    return result;
+  }
 }
diff --git a/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/migration/MigrateExtensionsResource.java b/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/migration/MigrateExtensionsResource.java
index 07fc157f6c..fc05cd0766 100644
--- a/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/migration/MigrateExtensionsResource.java
+++ b/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/migration/MigrateExtensionsResource.java
@@ -21,7 +21,9 @@
 import org.apache.streampipes.extensions.api.extractor.IParameterExtractor;
 import org.apache.streampipes.extensions.api.migration.IModelMigrator;
 import org.apache.streampipes.extensions.management.init.DeclarersSingleton;
+import org.apache.streampipes.extensions.management.locales.LabelGenerator;
 import org.apache.streampipes.model.base.VersionedNamedStreamPipesEntity;
+import org.apache.streampipes.model.connect.adapter.AdapterDescription;
 import org.apache.streampipes.model.extensions.migration.MigrationRequest;
 import org.apache.streampipes.model.migration.MigrationResult;
 import org.apache.streampipes.model.migration.ModelMigratorConfig;
@@ -31,12 +33,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
 import java.util.Optional;
 
 public abstract class MigrateExtensionsResource<
-        T extends VersionedNamedStreamPipesEntity,
-        ExT extends IParameterExtractor,
-        MmT extends IModelMigrator<T, ExT>> extends AbstractExtensionsResource {
+    T extends VersionedNamedStreamPipesEntity,
+    ExT extends IParameterExtractor,
+    MmT extends IModelMigrator<T, ExT>> extends AbstractExtensionsResource {
 
   private static final Logger LOG = LoggerFactory.getLogger(MigrateExtensionsResource.class);
 
@@ -49,11 +52,14 @@ public abstract class MigrateExtensionsResource<
    * @return Optional model migrator which is empty in case no appropriate migrator is found among the registered.
    */
   public Optional<MmT> getMigrator(ModelMigratorConfig modelMigratorConfig) {
-    return DeclarersSingleton.getInstance().getServiceDefinition().getMigrators()
-            .stream()
-            .filter(modelMigrator -> modelMigrator.config().equals(modelMigratorConfig))
-            .map(modelMigrator -> (MmT) modelMigrator)
-            .findFirst();
+    return DeclarersSingleton.getInstance()
+                             .getServiceDefinition()
+                             .getMigrators()
+                             .stream()
+                             .filter(modelMigrator -> modelMigrator.config()
+                                                                   .equals(modelMigratorConfig))
+                             .map(modelMigrator -> (MmT) modelMigrator)
+                             .findFirst();
   }
 
   /**
@@ -62,6 +68,7 @@ public Optional<MmT> getMigrator(ModelMigratorConfig modelMigratorConfig) {
    * The result is always part of the response.
    * Independent, of the migration outcome, the returned response always has OK as status code.
    * It is the responsibility of the recipient to interpret the migration result and act accordingly.
+   *
    * @param migrationRequest Request that contains both the pipeline element to be migrated and the migration config.
    * @return A response with status code ok, that contains a migration result reflecting the outcome of the operation.
    */
@@ -70,10 +77,11 @@ protected MigrationResult<T> handleMigration(MigrationRequest<T> migrationReques
     var pipelineElementDescription = migrationRequest.migrationElement();
     var migrationConfig = migrationRequest.modelMigratorConfig();
 
-    LOG.info("Received migration request for pipeline element '{}' to migrate from version {} to {}",
-            pipelineElementDescription.getElementId(),
-            migrationConfig.fromVersion(),
-            migrationConfig.toVersion()
+    LOG.info(
+        "Received migration request for pipeline element '{}' to migrate from version {} to {}",
+        pipelineElementDescription.getElementId(),
+        migrationConfig.fromVersion(),
+        migrationConfig.toVersion()
     );
 
     var migratorOptional = getMigrator(migrationConfig);
@@ -84,23 +92,24 @@ protected MigrationResult<T> handleMigration(MigrationRequest<T> migrationReques
     }
     LOG.error("Migrator for migration config {} could not be found. Migration is cancelled.", migrationConfig);
     return MigrationResult.failure(
-            pipelineElementDescription,
-            String.format(
-                    "The given migration config '%s' could not be mapped to a registered migrator.",
-                    migrationConfig
-            )
+        pipelineElementDescription,
+        String.format(
+            "The given migration config '%s' could not be mapped to a registered migrator.",
+            migrationConfig
+        )
     );
   }
 
   /**
    * Executes the migration for the given pipeline element based on the given migrator.
-   * @param migrator migrator that executes the migration
+   *
+   * @param migrator                   migrator that executes the migration
    * @param pipelineElementDescription pipeline element to be migrated
    * @return the migration result containing either the migrated element or the original one in case of a failure
    */
   protected MigrationResult<T> executeMigration(
-          MmT migrator,
-          T pipelineElementDescription
+      MmT migrator,
+      T pipelineElementDescription
   ) {
 
     var extractor = getPropertyExtractor(pipelineElementDescription);
@@ -111,12 +120,18 @@ protected MigrationResult<T> executeMigration(
       if (result.success()) {
         LOG.info("Migration successfully finished.");
 
+        var migratedElement = result.element();
+
+        migratedElement = updateLabels(migratedElement);
+
         // Since adapter migration was successful, version can be adapted to the target version.
         // this step is explicitly performed here and not left to the migration itself to
         // prevent leaving this step out
-        var migratedProcessor = result.element();
-        migratedProcessor.setVersion(migrator.config().toVersion());
-        return MigrationResult.success(migratedProcessor);
+        migratedElement.setVersion(
+            migrator.config()
+                    .toVersion());
+
+        return MigrationResult.success(migratedElement);
 
       } else {
         LOG.error("Migration failed with the following reason: {}", result.message());
@@ -126,16 +141,28 @@ protected MigrationResult<T> executeMigration(
       }
     } catch (RuntimeException e) {
       LOG.error("An unexpected exception caused the migration to fail - "
-              + "sending exception report in migration result");
+                    + "sending exception report in migration result");
       return MigrationResult.failure(
-              pipelineElementDescription,
-              String.format(
-                      "Migration failed due to an unexpected exception: %s",
-                      StringUtils.join(e.getStackTrace(), "\n")
-              )
+          pipelineElementDescription,
+          String.format(
+              "Migration failed due to an unexpected exception: %s",
+              StringUtils.join(e.getStackTrace(), "\n")
+          )
       );
     }
   }
 
+  private static <T extends VersionedNamedStreamPipesEntity> T updateLabels(T migratedElement) {
+    if (migratedElement.isIncludesLocales()) {
+      try {
+        boolean replaceTitles = !(migratedElement instanceof AdapterDescription);
+        migratedElement = new LabelGenerator<>(migratedElement, replaceTitles).generateLabels();
+      } catch (IOException e) {
+        LOG.error("Failed to generate labels for migrated element: %s".formatted(migratedElement.getAppId()), e);
+      }
+    }
+    return migratedElement;
+  }
+
   protected abstract ExT getPropertyExtractor(T pipelineElementDescription);
 }
diff --git a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/StaticProperties.java b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/StaticProperties.java
index a2d6092e21..ce8defc273 100644
--- a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/StaticProperties.java
+++ b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/StaticProperties.java
@@ -114,6 +114,13 @@ public static FreeTextStaticProperty integerFreeTextProperty(Label label) {
     return freeTextProperty(label, Datatypes.Integer);
   }
 
+  public static FreeTextStaticProperty integerFreeTextProperty(Label label, int defaultValue) {
+    var property = freeTextProperty(label, Datatypes.Integer);
+    property.setValue(String.valueOf(defaultValue));
+    return property;
+  }
+
+
   public static FreeTextStaticProperty doubleFreeTextProperty(Label label) {
     return freeTextProperty(label, Datatypes.Double);
   }