diff --git a/CHANGELOG.md b/CHANGELOG.md
index 599d22840..4f0e9cd38 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ Note: version releases in the 0.x.y range may introduce breaking changes.
 ### Added
 
 - Flat : added more test and devise fixes ( see https://github.com/ehrbase/openEHR_SDK/pull/291)
+- Upgrade to Archie 1.0.4 ([#292](https://github.com/ehrbase/openEHR_SDK/pull/292))
 
 ### Fixed
 
diff --git a/building/pom.xml b/building/pom.xml
index 34203e403..f0cabe526 100644
--- a/building/pom.xml
+++ b/building/pom.xml
@@ -32,9 +32,17 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.github.openEHR.archie</groupId>
+            <groupId>com.nedap.healthcare.archie</groupId>
+            <artifactId>archie-utils</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.nedap.healthcare.archie</groupId>
             <artifactId>openehr-rm</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.nedap.healthcare.archie</groupId>
+            <artifactId>tools</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-collections4</artifactId>
diff --git a/pom.xml b/pom.xml
index 8ee49d4f8..98d816e70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,7 +87,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <antlr4.version>4.9.1</antlr4.version>
-        <archie.version>1.0.3</archie.version>
+        <archie.version>1.0.4</archie.version>
         <assertj.version>3.18.1</assertj.version>
         <cglib.version>3.3.0</cglib.version>
         <classgraph.version>4.8.98</classgraph.version>
@@ -314,6 +314,7 @@
                     <serverId>ossrh</serverId>
                     <nexusUrl>https://oss.sonatype.org/</nexusUrl>
                     <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                    <stagingProgressTimeoutMinutes>30</stagingProgressTimeoutMinutes>
                 </configuration>
             </plugin>
         </plugins>
@@ -472,15 +473,25 @@
                 <version>${everit-json-schema.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.github.openEHR</groupId>
-                <artifactId>archie</artifactId>
+                <groupId>com.nedap.healthcare.archie</groupId>
+                <artifactId>archie-utils</artifactId>
                 <version>${archie.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.github.openEHR.archie</groupId>
+                <groupId>com.nedap.healthcare.archie</groupId>
                 <artifactId>openehr-rm</artifactId>
                 <version>${archie.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.nedap.healthcare.archie</groupId>
+                <artifactId>test-rm</artifactId>
+                <version>${archie.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.nedap.healthcare.archie</groupId>
+                <artifactId>tools</artifactId>
+                <version>${archie.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.google.code.gson</groupId>
                 <artifactId>gson</artifactId>
diff --git a/response-dto/pom.xml b/response-dto/pom.xml
index 266fde5e6..303acc2ae 100644
--- a/response-dto/pom.xml
+++ b/response-dto/pom.xml
@@ -33,8 +33,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.github.openEHR</groupId>
-            <artifactId>archie</artifactId>
+            <groupId>com.nedap.healthcare.archie</groupId>
+            <artifactId>openehr-rm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
diff --git a/serialisation/pom.xml b/serialisation/pom.xml
index 5110837e3..6b5ef3029 100644
--- a/serialisation/pom.xml
+++ b/serialisation/pom.xml
@@ -32,6 +32,10 @@
     <artifactId>serialisation</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>com.nedap.healthcare.archie</groupId>
+            <artifactId>test-rm</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.ehrbase.openehr.sdk</groupId>
             <artifactId>web-template</artifactId>
@@ -70,10 +74,6 @@
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.github.openEHR</groupId>
-            <artifactId>archie</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
diff --git a/terminology/pom.xml b/terminology/pom.xml
index 6407f3e66..2afdf6904 100644
--- a/terminology/pom.xml
+++ b/terminology/pom.xml
@@ -33,8 +33,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.github.openEHR</groupId>
-            <artifactId>archie</artifactId>
+            <groupId>com.nedap.healthcare.archie</groupId>
+            <artifactId>openehr-rm</artifactId>
         </dependency>
         <dependency>
             <groupId>org.ehrbase.openehr.sdk</groupId>
diff --git a/validation/pom.xml b/validation/pom.xml
index a49502188..e99b34b7d 100644
--- a/validation/pom.xml
+++ b/validation/pom.xml
@@ -41,8 +41,9 @@
             <artifactId>opt-1.4</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.github.openEHR</groupId>
-            <artifactId>archie</artifactId>
+            <groupId>com.nedap.healthcare.archie</groupId>
+            <artifactId>archie-utils</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.ehrbase.openehr.sdk</groupId>
diff --git a/web-template/pom.xml b/web-template/pom.xml
index 40533bf4d..b52bd26d7 100644
--- a/web-template/pom.xml
+++ b/web-template/pom.xml
@@ -65,10 +65,6 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.github.openEHR</groupId>
-            <artifactId>archie</artifactId>
-        </dependency>
         <dependency>
             <groupId>javax.cache</groupId>
             <artifactId>cache-api</artifactId>