diff --git a/RFS/src/main/java/com/rfs/version_os_2_11/IndexCreator_OS_2_11.java b/RFS/src/main/java/com/rfs/version_os_2_11/IndexCreator_OS_2_11.java
index 2a1f23784..b18cd4569 100644
--- a/RFS/src/main/java/com/rfs/version_os_2_11/IndexCreator_OS_2_11.java
+++ b/RFS/src/main/java/com/rfs/version_os_2_11/IndexCreator_OS_2_11.java
@@ -29,7 +29,8 @@ public Optional<ObjectNode> create(IndexMetadata index, String indexName, String
         // Assemble the request body
         ObjectNode body = mapper.createObjectNode();
         body.set("aliases", indexMetadata.getAliases());
-        body.set("mappings", indexMetadata.getMappings());
+        // Working around for missing OS_1_3 definition
+        body.set("mappings", index.rawJson().get("mappings"));
         body.set("settings", settings);
 
         // Create the index; it's fine if it already exists
diff --git a/RFS/src/testFixtures/java/com/rfs/framework/PreloadedDataContainerOrchestrator.java b/RFS/src/testFixtures/java/com/rfs/framework/PreloadedDataContainerOrchestrator.java
index 1df70d311..304dd4824 100644
--- a/RFS/src/testFixtures/java/com/rfs/framework/PreloadedDataContainerOrchestrator.java
+++ b/RFS/src/testFixtures/java/com/rfs/framework/PreloadedDataContainerOrchestrator.java
@@ -111,7 +111,7 @@ private int getHashCodeOfImagesAndArgs(DockerClient dockerClient, boolean pullIf
     }
 
     private String getImageName() {
-        return PRELOADED_IMAGE_BASE_NAME + baseSourceVersion.prettyName;
+        return PRELOADED_IMAGE_BASE_NAME + baseSourceVersion.prettyName.replace(" ", "_").toLowerCase();
     }
 
     private static DockerClient createDockerClient() {