diff --git a/org.hl7.fhir.convertors/pom.xml b/org.hl7.fhir.convertors/pom.xml
index aaea75d53..0f47b01ca 100644
--- a/org.hl7.fhir.convertors/pom.xml
+++ b/org.hl7.fhir.convertors/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>org.hl7.fhir.core</artifactId>
-        <version>3.8.12-SNAPSHOT</version>
+        <version>3.8.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/org.hl7.fhir.dstu2/pom.xml b/org.hl7.fhir.dstu2/pom.xml
index ab2ccfe80..37de5d0b7 100644
--- a/org.hl7.fhir.dstu2/pom.xml
+++ b/org.hl7.fhir.dstu2/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>org.hl7.fhir.core</artifactId>
-		<version>3.8.12-SNAPSHOT</version>
+		<version>3.8.13-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/org.hl7.fhir.dstu2016may/pom.xml b/org.hl7.fhir.dstu2016may/pom.xml
index 11dc64578..441d5349e 100644
--- a/org.hl7.fhir.dstu2016may/pom.xml
+++ b/org.hl7.fhir.dstu2016may/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>org.hl7.fhir.core</artifactId>
-		<version>3.8.12-SNAPSHOT</version>
+		<version>3.8.13-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/org.hl7.fhir.dstu3/pom.xml b/org.hl7.fhir.dstu3/pom.xml
index e007af116..0c5899db0 100644
--- a/org.hl7.fhir.dstu3/pom.xml
+++ b/org.hl7.fhir.dstu3/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>org.hl7.fhir.core</artifactId>
-        <version>3.8.12-SNAPSHOT</version>
+        <version>3.8.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/org.hl7.fhir.r4/pom.xml b/org.hl7.fhir.r4/pom.xml
index 408cc4aa1..3b9db9c44 100644
--- a/org.hl7.fhir.r4/pom.xml
+++ b/org.hl7.fhir.r4/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>org.hl7.fhir.core</artifactId>
-		<version>3.8.12-SNAPSHOT</version>
+		<version>3.8.13-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml
index 2afc0dcc6..2a092b671 100644
--- a/org.hl7.fhir.r5/pom.xml
+++ b/org.hl7.fhir.r5/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>org.hl7.fhir.core</artifactId>
-		<version>3.8.12-SNAPSHOT</version>
+		<version>3.8.13-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/org.hl7.fhir.r5/src/test/resources/openapi/swagger-base.json b/org.hl7.fhir.r5/src/test/resources/openapi/swagger-base.json
index 3a129b1c9..5bd470b3d 100644
--- a/org.hl7.fhir.r5/src/test/resources/openapi/swagger-base.json
+++ b/org.hl7.fhir.r5/src/test/resources/openapi/swagger-base.json
@@ -29,12 +29,12 @@
             "content": {
               "application/fhir+json": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/OperationOutcome"
+                  "$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/OperationOutcome"
                 }
               },
               "application/fhir+xml": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/OperationOutcome.xsd"
+                  "$ref": "https://hl7.org/fhir/R4/OperationOutcome.xsd"
                 }
               }
             }
@@ -44,12 +44,12 @@
             "content": {
               "application/fhir+json": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/CapabilityStatement"
+                  "$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/CapabilityStatement"
                 }
               },
               "application/fhir+xml": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/CapabilityStatement.xsd"
+                  "$ref": "https://hl7.org/fhir/R4/CapabilityStatement.xsd"
                 }
               }
             }
@@ -83,12 +83,12 @@
             "content": {
               "application/fhir+json": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/OperationOutcome"
+                  "$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/OperationOutcome"
                 }
               },
               "application/fhir+xml": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/OperationOutcome.xsd"
+                  "$ref": "https://hl7.org/fhir/R4/OperationOutcome.xsd"
                 }
               }
             }
@@ -98,12 +98,12 @@
             "content": {
               "application/fhir+json": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/Bundle"
+                  "$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/Bundle"
                 }
               },
               "application/fhir+xml": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/Bundle.xsd"
+                  "$ref": "https://hl7.org/fhir/R4/Bundle.xsd"
                 }
               }
             }
@@ -198,12 +198,12 @@
           "content": {
             "application/fhir+json": {
               "schema": {
-                "$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/Account"
+                "$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/Account"
               }
             },
             "application/fhir+xml": {
               "schema": {
-                "$ref": "https://hl7.org/fhir/STU3/Account.xsd"
+                "$ref": "https://hl7.org/fhir/R4/Account.xsd"
               }
             }
           }
@@ -214,12 +214,12 @@
             "content": {
               "application/fhir+json": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/OperationOutcome"
+                  "$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/OperationOutcome"
                 }
               },
               "application/fhir+xml": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/OperationOutcome.xsd"
+                  "$ref": "https://hl7.org/fhir/R4/OperationOutcome.xsd"
                 }
               }
             }
@@ -237,12 +237,12 @@
             "content": {
               "application/fhir+json": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/Account"
+                  "$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/Account"
                 }
               },
               "application/fhir+xml": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/Account.xsd"
+                  "$ref": "https://hl7.org/fhir/R4/Account.xsd"
                 }
               }
             }
@@ -276,12 +276,12 @@
             "content": {
               "application/fhir+json": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/OperationOutcome"
+                  "$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/OperationOutcome"
                 }
               },
               "application/fhir+xml": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/OperationOutcome.xsd"
+                  "$ref": "https://hl7.org/fhir/R4/OperationOutcome.xsd"
                 }
               }
             }
@@ -299,12 +299,12 @@
             "content": {
               "application/fhir+json": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/Account"
+                  "$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/Account"
                 }
               },
               "application/fhir+xml": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/Account.xsd"
+                  "$ref": "https://hl7.org/fhir/R4/Account.xsd"
                 }
               }
             }
@@ -337,12 +337,12 @@
           "content": {
             "application/fhir+json": {
               "schema": {
-                "$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/Account"
+                "$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/Account"
               }
             },
             "application/fhir+xml": {
               "schema": {
-                "$ref": "https://hl7.org/fhir/STU3/Account.xsd"
+                "$ref": "https://hl7.org/fhir/R4/Account.xsd"
               }
             }
           }
@@ -353,12 +353,12 @@
             "content": {
               "application/fhir+json": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/OperationOutcome"
+                  "$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/OperationOutcome"
                 }
               },
               "application/fhir+xml": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/OperationOutcome.xsd"
+                  "$ref": "https://hl7.org/fhir/R4/OperationOutcome.xsd"
                 }
               }
             }
@@ -376,12 +376,12 @@
             "content": {
               "application/fhir+json": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/Account"
+                  "$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/Account"
                 }
               },
               "application/fhir+xml": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/Account.xsd"
+                  "$ref": "https://hl7.org/fhir/R4/Account.xsd"
                 }
               }
             }
@@ -414,12 +414,12 @@
             "content": {
               "application/fhir+json": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/OperationOutcome"
+                  "$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/OperationOutcome"
                 }
               },
               "application/fhir+xml": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/OperationOutcome.xsd"
+                  "$ref": "https://hl7.org/fhir/R4/OperationOutcome.xsd"
                 }
               }
             }
@@ -455,12 +455,12 @@
             "content": {
               "application/fhir+json": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/OperationOutcome"
+                  "$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/OperationOutcome"
                 }
               },
               "application/fhir+xml": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/OperationOutcome.xsd"
+                  "$ref": "https://hl7.org/fhir/R4/OperationOutcome.xsd"
                 }
               }
             }
@@ -470,12 +470,12 @@
             "content": {
               "application/fhir+json": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/Bundle"
+                  "$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/Bundle"
                 }
               },
               "application/fhir+xml": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/Bundle.xsd"
+                  "$ref": "https://hl7.org/fhir/R4/Bundle.xsd"
                 }
               }
             }
@@ -541,12 +541,12 @@
             "content": {
               "application/fhir+json": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/OperationOutcome"
+                  "$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/OperationOutcome"
                 }
               },
               "application/fhir+xml": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/OperationOutcome.xsd"
+                  "$ref": "https://hl7.org/fhir/R4/OperationOutcome.xsd"
                 }
               }
             }
@@ -564,12 +564,12 @@
             "content": {
               "application/fhir+json": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/Account"
+                  "$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/Account"
                 }
               },
               "application/fhir+xml": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/Account.xsd"
+                  "$ref": "https://hl7.org/fhir/R4/Account.xsd"
                 }
               }
             }
@@ -609,12 +609,12 @@
             "content": {
               "application/fhir+json": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/OperationOutcome"
+                  "$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/OperationOutcome"
                 }
               },
               "application/fhir+xml": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/OperationOutcome.xsd"
+                  "$ref": "https://hl7.org/fhir/R4/OperationOutcome.xsd"
                 }
               }
             }
@@ -624,12 +624,12 @@
             "content": {
               "application/fhir+json": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/Bundle"
+                  "$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/Bundle"
                 }
               },
               "application/fhir+xml": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/Bundle.xsd"
+                  "$ref": "https://hl7.org/fhir/R4/Bundle.xsd"
                 }
               }
             }
@@ -692,12 +692,12 @@
             "content": {
               "application/fhir+json": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/OperationOutcome"
+                  "$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/OperationOutcome"
                 }
               },
               "application/fhir+xml": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/OperationOutcome.xsd"
+                  "$ref": "https://hl7.org/fhir/R4/OperationOutcome.xsd"
                 }
               }
             }
@@ -707,12 +707,12 @@
             "content": {
               "application/fhir+json": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/Bundle"
+                  "$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/Bundle"
                 }
               },
               "application/fhir+xml": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/Bundle.xsd"
+                  "$ref": "https://hl7.org/fhir/R4/Bundle.xsd"
                 }
               }
             }
@@ -775,12 +775,12 @@
             "content": {
               "application/fhir+json": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/OperationOutcome"
+                  "$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/OperationOutcome"
                 }
               },
               "application/fhir+xml": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/OperationOutcome.xsd"
+                  "$ref": "https://hl7.org/fhir/R4/OperationOutcome.xsd"
                 }
               }
             }
@@ -790,12 +790,12 @@
             "content": {
               "application/fhir+json": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/Bundle"
+                  "$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/Bundle"
                 }
               },
               "application/fhir+xml": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/Bundle.xsd"
+                  "$ref": "https://hl7.org/fhir/R4/Bundle.xsd"
                 }
               }
             }
@@ -976,12 +976,12 @@
           "content": {
             "application/fhir+json": {
               "schema": {
-                "$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/Bundle"
+                "$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/Bundle"
               }
             },
             "application/fhir+xml": {
               "schema": {
-                "$ref": "https://hl7.org/fhir/STU3/Bundle.xsd"
+                "$ref": "https://hl7.org/fhir/R4/Bundle.xsd"
               }
             }
           }
@@ -992,12 +992,12 @@
             "content": {
               "application/fhir+json": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/OperationOutcome"
+                  "$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/OperationOutcome"
                 }
               },
               "application/fhir+xml": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/OperationOutcome.xsd"
+                  "$ref": "https://hl7.org/fhir/R4/OperationOutcome.xsd"
                 }
               }
             }
@@ -1007,12 +1007,12 @@
             "content": {
               "application/fhir+json": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/Bundle"
+                  "$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/Bundle"
                 }
               },
               "application/fhir+xml": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/Bundle.xsd"
+                  "$ref": "https://hl7.org/fhir/R4/Bundle.xsd"
                 }
               }
             }
diff --git a/org.hl7.fhir.r5/src/test/resources/openapi/swagger-base2.json b/org.hl7.fhir.r5/src/test/resources/openapi/swagger-base2.json
index f513ac4d6..c9382a8c4 100644
--- a/org.hl7.fhir.r5/src/test/resources/openapi/swagger-base2.json
+++ b/org.hl7.fhir.r5/src/test/resources/openapi/swagger-base2.json
@@ -29,12 +29,12 @@
             "content": {
               "application/fhir+json": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/OperationOutcome"
+                  "$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/OperationOutcome"
                 }
               },
               "application/fhir+xml": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/OperationOutcome.xsd"
+                  "$ref": "https://hl7.org/fhir/R4/OperationOutcome.xsd"
                 }
               }
             }
@@ -44,12 +44,12 @@
             "content": {
               "application/fhir+json": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/CapabilityStatement"
+                  "$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/CapabilityStatement"
                 }
               },
               "application/fhir+xml": {
                 "schema": {
-                  "$ref": "https://hl7.org/fhir/STU3/CapabilityStatement.xsd"
+                  "$ref": "https://hl7.org/fhir/R4/CapabilityStatement.xsd"
                 }
               }
             }
diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml
index 472094ddd..31f6860b4 100644
--- a/org.hl7.fhir.utilities/pom.xml
+++ b/org.hl7.fhir.utilities/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>org.hl7.fhir.core</artifactId>
-        <version>3.8.12-SNAPSHOT</version>
+        <version>3.8.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml
index 87d4912f3..a36fafaec 100644
--- a/org.hl7.fhir.validation.cli/pom.xml
+++ b/org.hl7.fhir.validation.cli/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>org.hl7.fhir.core</artifactId>
-        <version>3.8.12-SNAPSHOT</version>
+        <version>3.8.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml
index 36b85497e..d992ca13d 100644
--- a/org.hl7.fhir.validation/pom.xml
+++ b/org.hl7.fhir.validation/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>org.hl7.fhir.core</artifactId>
-        <version>3.8.12-SNAPSHOT</version>
+        <version>3.8.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 52379c1e4..ba23f7efa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	each other. It is fine to bump the point version of this POM without affecting
 	HAPI FHIR.
 	-->
-	<version>3.8.12-SNAPSHOT</version>
+	<version>3.8.13-SNAPSHOT</version>
 
 	<properties>
 		<hapi_fhir_version>4.0.0-SNAPSHOT</hapi_fhir_version>
diff --git a/release.bat b/release.bat
index 97a2b6461..2b4d73251 100644
--- a/release.bat
+++ b/release.bat
@@ -1,7 +1,7 @@
 @echo off
 
-set oldver=3.8.11
-set newver=3.8.12
+set oldver=3.8.12
+set newver=3.8.13
 
 echo ..
 echo =====================================================================