diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle
index 3298b6e95..367e5c145 100644
--- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle
+++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 description = 'Galasa Openstack Manager'
 
-version = '0.32.0'
+version = '0.36.0'
 
 dependencies {
     api            project(':galasa-managers-comms-parent:dev.galasa.ipnetwork.manager')
diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java
index 46a3158d3..5cea2c044 100644
--- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java
+++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java
@@ -60,6 +60,7 @@
 import dev.galasa.openstack.manager.internal.json.User;
 import dev.galasa.openstack.manager.internal.properties.OpenStackCredentialsId;
 import dev.galasa.openstack.manager.internal.properties.OpenStackDomainName;
+import dev.galasa.openstack.manager.internal.properties.OpenStackFloatingIPPool;
 import dev.galasa.openstack.manager.internal.properties.OpenStackIdentityUri;
 import dev.galasa.openstack.manager.internal.properties.OpenStackProjectName;
 
@@ -239,7 +240,7 @@ public Server findServerByName(@NotNull String serverName) throws OpenstackManag
         try {
             checkToken();
 
-            // *** Retrieve a list of the networks available and select one
+            // *** Retrieve a list of the servers available and select one
 
             HttpGet get = new HttpGet(this.openstackComputeUri + "/servers");
             get.addHeader(this.openstackToken.getHeader());
@@ -578,7 +579,7 @@ protected String getFlavourId(@NotNull String flavour) throws OpenstackManagerEx
         try {
             checkToken();
 
-            // *** Retrieve a list of the images
+            // *** Retrieve a list of the flavours
 
             HttpGet get = new HttpGet(this.openstackComputeUri + "/flavors");
             get.addHeader(this.openstackToken.getHeader());
@@ -588,7 +589,7 @@ protected String getFlavourId(@NotNull String flavour) throws OpenstackManagerEx
                 String entity = EntityUtils.toString(response.getEntity());
 
                 if (status.getStatusCode() != HttpStatus.SC_OK) {
-                    throw new OpenstackManagerException("OpenStack list image failed - " + status);
+                    throw new OpenstackManagerException("OpenStack list flavour failed - " + status);
                 }
 
                 Flavors flavours = gson.fromJson(entity, Flavors.class);
@@ -614,9 +615,12 @@ public Floatingip allocateFloatingip(Port port, Network network) throws Openstac
         try {
             checkToken();
 
+            String fipPool = OpenStackFloatingIPPool.get();
+
             Floatingip fip = new Floatingip();
             fip.port_id = port.id;
             fip.floating_network_id = network.id;
+            fip.floating_ip_address = fipPool;
             fip.description = "galasa_run=" + this.framework.getTestRunName();
 
             FloatingipRequestResponse fipRequest = new FloatingipRequestResponse();
@@ -633,7 +637,7 @@ public Floatingip allocateFloatingip(Port port, Network network) throws Openstac
                 String entity = EntityUtils.toString(response.getEntity());
 
                 if (status.getStatusCode() != HttpStatus.SC_CREATED) {
-                    throw new OpenstackManagerException("OpenStack list image failed - " + status);
+                    throw new OpenstackManagerException("OpenStack create floating ip failed - " + status);
                 }
 
                 FloatingipRequestResponse fipResponse = this.gson.fromJson(entity, FloatingipRequestResponse.class);
@@ -684,7 +688,7 @@ public Network findExternalNetwork(String externalNetwork) throws OpenstackManag
         } catch (OpenstackManagerException e) {
             throw e;
         } catch (Exception e) {
-            throw new OpenstackManagerException("Unable to list floating ips ", e);
+            throw new OpenstackManagerException("Unable to list networks ", e);
         }
     }
 
diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/BuildTimeout.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/BuildTimeout.java
index 4bc5949ee..6066c4878 100644
--- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/BuildTimeout.java
+++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/BuildTimeout.java
@@ -22,8 +22,6 @@
  * <p>
  * default value is 10 minutes
  * </p>
- * 
- *  
  *
  */
 public class BuildTimeout extends CpsProperties {
diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxArchivesDirectory.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxArchivesDirectory.java
index 68fabae90..4c02be8aa 100644
--- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxArchivesDirectory.java
+++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxArchivesDirectory.java
@@ -23,8 +23,6 @@
  * <p>
  * Default is /opt/archives
  * </p>
- * 
- *  
  *
  */
 public class LinuxArchivesDirectory extends CpsProperties {
diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxAvailablityZone.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxAvailablityZone.java
index aebbde5d0..f557c65af 100644
--- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxAvailablityZone.java
+++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxAvailablityZone.java
@@ -26,8 +26,6 @@
  * <p>
  * The default is nova
  * </p>
- * 
- *  
  *
  */
 public class LinuxAvailablityZone extends CpsProperties {
diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxCredentials.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxCredentials.java
index 2ede2cb77..a7ccd9928 100644
--- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxCredentials.java
+++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxCredentials.java
@@ -27,8 +27,6 @@
  * <p>
  * The default is OPENSTACKSSH
  * </p>
- * 
- *  
  *
  */
 public class LinuxCredentials extends CpsProperties {
diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxFlavor.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxFlavor.java
index abed6f2a0..4765e4fdb 100644
--- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxFlavor.java
+++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxFlavor.java
@@ -26,8 +26,6 @@
  * <p>
  * The default is m1.medium
  * </p>
- * 
- *  
  *
  */
 public class LinuxFlavor extends CpsProperties {
diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxImageCapabilities.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxImageCapabilities.java
index aaec60808..5e4034b52 100644
--- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxImageCapabilities.java
+++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxImageCapabilities.java
@@ -32,8 +32,6 @@
  * <p>
  * The default is no capabilities
  * </p>
- * 
- *  
  *
  */
 public class LinuxImageCapabilities extends CpsProperties {
diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxImages.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxImages.java
index f0b38fbdb..75ccc4eac 100644
--- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxImages.java
+++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxImages.java
@@ -32,8 +32,6 @@
  * <p>
  * There are no defaults
  * </p>
- * 
- *  
  *
  */
 public class LinuxImages extends CpsProperties {
diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxKeyPair.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxKeyPair.java
index 227d67f94..5d15e2b06 100644
--- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxKeyPair.java
+++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxKeyPair.java
@@ -26,8 +26,6 @@
  * <p>
  * There is no default
  * </p>
- * 
- *  
  *
  */
 public class LinuxKeyPair extends CpsProperties {
diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxName.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxName.java
index c17b48949..c039dabeb 100644
--- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxName.java
+++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxName.java
@@ -26,8 +26,6 @@
  * <p>
  * The default is the same as the imagename
  * </p>
- * 
- *  
  *
  */
 public class LinuxName extends CpsProperties {
diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxSecurityGroups.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxSecurityGroups.java
index ff6572442..0c25da035 100644
--- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxSecurityGroups.java
+++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxSecurityGroups.java
@@ -29,8 +29,6 @@
  * <p>
  * There is no default
  * </p>
- * 
- *   
  *
  */
 public class LinuxSecurityGroups extends CpsProperties {
diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/MaximumInstances.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/MaximumInstances.java
index 862a41bdb..477e8f684 100644
--- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/MaximumInstances.java
+++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/MaximumInstances.java
@@ -22,8 +22,6 @@
  * <p>
  * default value is 2 instaces
  * </p>
- * 
- *  
  *
  */
 public class MaximumInstances extends CpsProperties {
diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/NamePool.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/NamePool.java
index 2ecf48133..44dee1efc 100644
--- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/NamePool.java
+++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/NamePool.java
@@ -30,8 +30,6 @@
  * <p>
  * default value is GALASA{0-9}{0-9}
  * </p>
- * 
- *  
  *
  */
 public class NamePool extends CpsProperties {
diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackCredentialsId.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackCredentialsId.java
index 4df1e9a40..7ca8c8f3f 100644
--- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackCredentialsId.java
+++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackCredentialsId.java
@@ -23,8 +23,6 @@
  * <p>
  * default value is openstack
  * </p>
- * 
- *  
  *
  */
 public class OpenStackCredentialsId extends CpsProperties {
diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackDomainName.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackDomainName.java
index 241a0ad69..090a18085 100644
--- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackDomainName.java
+++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackDomainName.java
@@ -26,8 +26,6 @@
  * <p>
  * There is no default
  * </p>
- * 
- *  
  *
  */
 public class OpenStackDomainName extends CpsProperties {
diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackEnabled.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackEnabled.java
index c32e468b1..80a27ac28 100644
--- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackEnabled.java
+++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackEnabled.java
@@ -23,8 +23,6 @@
  * <p>
  * default value is true
  * </p>
- * 
- *  
  *
  */
 public class OpenStackEnabled extends CpsProperties {
diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackFloatingIPPool.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackFloatingIPPool.java
new file mode 100644
index 000000000..9f0c227e4
--- /dev/null
+++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackFloatingIPPool.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright contributors to the Galasa project
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package dev.galasa.openstack.manager.internal.properties;
+
+import dev.galasa.framework.spi.ConfigurationPropertyStoreException;
+import dev.galasa.framework.spi.cps.CpsProperties;
+import dev.galasa.openstack.manager.OpenstackManagerException;
+
+/**
+ * OpenStack Floating IP Pool
+ * <p>
+ * The Openstack Floating IP Pool that the OpenStack Manager will use
+ * to create a Floating IP address within.
+ * </p>
+ * <p>
+ * The property is:-<br>
+ * <br>
+ * openstack.server.floatingip.pool=my_network_name
+ * </p>
+ * <p>
+ * There is no default
+ * </p>
+ *
+ */
+public class OpenStackFloatingIPPool extends CpsProperties {
+
+    public static String get()
+            throws ConfigurationPropertyStoreException, OpenstackManagerException {
+        return getStringNulled(OpenstackPropertiesSingleton.cps(), "server", "floatingip.pool");
+    }
+
+}
diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackIdentityUri.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackIdentityUri.java
index f2bce271d..6af2dda1b 100644
--- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackIdentityUri.java
+++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackIdentityUri.java
@@ -25,8 +25,6 @@
  * <p>
  * There is no default
  * </p>
- * 
- *  
  *
  */
 public class OpenStackIdentityUri extends CpsProperties {
diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackLinuxPriority.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackLinuxPriority.java
index 680595fa5..53a5a704b 100644
--- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackLinuxPriority.java
+++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackLinuxPriority.java
@@ -23,8 +23,6 @@
  * <p>
  * default value is 1
  * </p>
- * 
- *  
  *
  */
 public class OpenStackLinuxPriority extends CpsProperties {
diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackProjectName.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackProjectName.java
index 3d9c7dcba..bbf036d24 100644
--- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackProjectName.java
+++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackProjectName.java
@@ -26,8 +26,6 @@
  * <p>
  * There is no default
  * </p>
- * 
- *  
  *
  */
 public class OpenStackProjectName extends CpsProperties {
diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsAvailablityZone.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsAvailablityZone.java
index 86e278b50..41e6e9a39 100644
--- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsAvailablityZone.java
+++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsAvailablityZone.java
@@ -26,8 +26,6 @@
  * <p>
  * The default is nova
  * </p>
- * 
- *  
  *
  */
 public class WindowsAvailablityZone extends CpsProperties {
diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsCredentials.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsCredentials.java
index 5a432e7a1..2d4087e38 100644
--- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsCredentials.java
+++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsCredentials.java
@@ -27,8 +27,6 @@
  * <p>
  * The default is OPENSTACKSSH
  * </p>
- * 
- *  
  *
  */
 public class WindowsCredentials extends CpsProperties {
diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsFlavor.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsFlavor.java
index 7b67fb6cc..694c1f6a9 100644
--- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsFlavor.java
+++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsFlavor.java
@@ -26,8 +26,6 @@
  * <p>
  * The default is m1.medium
  * </p>
- * 
- *  
  *
  */
 public class WindowsFlavor extends CpsProperties {
diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsImageCapabilities.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsImageCapabilities.java
index 60497d2d5..ed036510b 100644
--- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsImageCapabilities.java
+++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsImageCapabilities.java
@@ -32,8 +32,6 @@
  * <p>
  * The default is no capabilities
  * </p>
- * 
- *  
  *
  */
 public class WindowsImageCapabilities extends CpsProperties {
diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsImages.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsImages.java
index 4842a8ec8..e24626470 100644
--- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsImages.java
+++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsImages.java
@@ -30,8 +30,6 @@
  * <p>
  * There are no defaults
  * </p>
- * 
- *  
  *
  */
 public class WindowsImages extends CpsProperties {
diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsKeyPair.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsKeyPair.java
index 57da85dfd..a79b38db1 100644
--- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsKeyPair.java
+++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsKeyPair.java
@@ -26,8 +26,6 @@
  * <p>
  * There is no default
  * </p>
- * 
- *  
  *
  */
 public class WindowsKeyPair extends CpsProperties {
diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsName.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsName.java
index 2ab4c8ee9..d8e1a1624 100644
--- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsName.java
+++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsName.java
@@ -26,8 +26,6 @@
  * <p>
  * The default is the same as the imagename
  * </p>
- * 
- *  
  *
  */
 public class WindowsName extends CpsProperties {
diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsSecurityGroups.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsSecurityGroups.java
index 7f2a6d4c5..838ea878f 100644
--- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsSecurityGroups.java
+++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsSecurityGroups.java
@@ -28,8 +28,6 @@
  * <p>
  * There is no default
  * </p>
- * 
- *   
  *
  */
 public class WindowsSecurityGroups extends CpsProperties {
diff --git a/release.yaml b/release.yaml
index f59e9a050..83b17a86f 100644
--- a/release.yaml
+++ b/release.yaml
@@ -160,7 +160,7 @@ managers:
     codecoverage: true
 
   - artifact: dev.galasa.openstack.manager
-    version: 0.32.0
+    version: 0.36.0
     obr:          true
     mvp:          false
     bom:          true