diff --git a/src/main/java/io/codeka/gaia/registries/RegistryRawContent.kt b/src/main/java/io/codeka/gaia/registries/RegistryRawContent.kt
index 939b3c246..c3edef0a5 100644
--- a/src/main/java/io/codeka/gaia/registries/RegistryRawContent.kt
+++ b/src/main/java/io/codeka/gaia/registries/RegistryRawContent.kt
@@ -35,11 +35,10 @@ abstract class RegistryRawContent(private val registryType: RegistryType, privat
         val requestEntity = HttpEntity<Any>(headers)
 
         val response = restTemplate.exchange(
-                this.registryType.readmeUrl,
+                this.registryType.readmeUrl.replace("{id}", module.registryDetails.projectId),
                 HttpMethod.GET,
                 requestEntity,
-                RegistryFile::class.java,
-                module.registryDetails.projectId)
+                RegistryFile::class.java)
 
         if(response.statusCode == HttpStatus.OK) {
             return Optional.of(String(Base64.getDecoder().decode(response.body?.content)))
diff --git a/src/test/java/io/codeka/gaia/registries/github/GitHubRawContentTest.java b/src/test/java/io/codeka/gaia/registries/github/GitHubRawContentTest.java
index a4419c11b..78aef29a2 100644
--- a/src/test/java/io/codeka/gaia/registries/github/GitHubRawContentTest.java
+++ b/src/test/java/io/codeka/gaia/registries/github/GitHubRawContentTest.java
@@ -54,7 +54,7 @@ void matches_shouldReturnFalseForInvalidUrl() {
     void getReadmeContent_shouldCallTheApi_andServeDecodedContent(){
         // given
         var module = new TerraformModule();
-        module.setRegistryDetails(new RegistryDetails(RegistryType.GITLAB, "group/project"));
+        module.setRegistryDetails(new RegistryDetails(RegistryType.GITHUB, "Apophis/Chulak"));
 
         var jack = new User("Jack", null);
         jack.setOAuth2User(new OAuth2User("GITHUB","TOKENSTRING", null));
@@ -66,11 +66,10 @@ void getReadmeContent_shouldCallTheApi_andServeDecodedContent(){
         var response = new ResponseEntity<>(githubFile, HttpStatus.OK);
 
         when(restTemplate.exchange(
-                eq("https://api.github.com/repos/{id}/contents/README.md?ref=master"),
+                eq("https://api.github.com/repos/Apophis/Chulak/contents/README.md?ref=master"),
                 eq(HttpMethod.GET),
                 requestCaptor.capture(),
-                eq(RegistryFile.class),
-                eq("group/project"))).thenReturn(response);
+                eq(RegistryFile.class))).thenReturn(response);
 
         // when
         var result = gitHubRawContent.getReadme(module);
@@ -86,7 +85,7 @@ void getReadmeContent_shouldCallTheApi_andServeDecodedContent(){
     void getReadmeContent_shouldCallTheApiWithoutAuth_ifNoToken_andServeDecodedContent(){
         // given
         var module = new TerraformModule();
-        module.setRegistryDetails(new RegistryDetails(RegistryType.GITLAB,  "group/project"));
+        module.setRegistryDetails(new RegistryDetails(RegistryType.GITHUB,  "Apophis/Chulak"));
 
         var jack = new User("Jack", null);
         module.setCreatedBy(jack);
@@ -97,11 +96,10 @@ void getReadmeContent_shouldCallTheApiWithoutAuth_ifNoToken_andServeDecodedConte
         var response = new ResponseEntity<>(githubFile, HttpStatus.OK);
 
         when(restTemplate.exchange(
-                eq("https://api.github.com/repos/{id}/contents/README.md?ref=master"),
+                eq("https://api.github.com/repos/Apophis/Chulak/contents/README.md?ref=master"),
                 eq(HttpMethod.GET),
                 requestCaptor.capture(),
-                eq(RegistryFile.class),
-                eq("group/project"))).thenReturn(response);
+                eq(RegistryFile.class))).thenReturn(response);
 
         // when
         var result = gitHubRawContent.getReadme(module);
@@ -117,7 +115,7 @@ void getReadmeContent_shouldCallTheApiWithoutAuth_ifNoToken_andServeDecodedConte
     void getReadmeContent_shouldCallTheApiWithoutAuth_ifNoOwner_andServeDecodedContent(){
         // given
         var module = new TerraformModule();
-        module.setRegistryDetails(new RegistryDetails(RegistryType.GITLAB,  "group/project"));
+        module.setRegistryDetails(new RegistryDetails(RegistryType.GITHUB,  "Apophis/Chulak"));
 
         var requestCaptor = ArgumentCaptor.forClass(HttpEntity.class);
 
@@ -125,11 +123,10 @@ void getReadmeContent_shouldCallTheApiWithoutAuth_ifNoOwner_andServeDecodedConte
         var response = new ResponseEntity<>(githubFile, HttpStatus.OK);
 
         when(restTemplate.exchange(
-                eq(RegistryType.GITHUB.getReadmeUrl()),
+                eq("https://api.github.com/repos/Apophis/Chulak/contents/README.md?ref=master"),
                 eq(HttpMethod.GET),
                 requestCaptor.capture(),
-                eq(RegistryFile.class),
-                eq("group/project"))).thenReturn(response);
+                eq(RegistryFile.class))).thenReturn(response);
 
         // when
         var result = gitHubRawContent.getReadme(module);
@@ -157,10 +154,10 @@ void getReadmeContent_withNoRegistryDetails_returnsEmptyContent(){
     void getReadmeContent_shouldReturnEmpty_whenReadmeDoesntExists(){
         // given
         var module = new TerraformModule();
-        module.setRegistryDetails(new RegistryDetails(RegistryType.GITLAB, "123"));
+        module.setRegistryDetails(new RegistryDetails(RegistryType.GITHUB, "Apophis/Chulak"));
 
         var jack = new User("Jack", null);
-        jack.setOAuth2User(new OAuth2User("GITLAB","TOKENSTRING", null));
+        jack.setOAuth2User(new OAuth2User("GITHUB","TOKENSTRING", null));
         module.setCreatedBy(jack);
 
         var requestCaptor = ArgumentCaptor.forClass(HttpEntity.class);
@@ -168,11 +165,10 @@ void getReadmeContent_shouldReturnEmpty_whenReadmeDoesntExists(){
         var response = new ResponseEntity<RegistryFile>(HttpStatus.NOT_FOUND);
 
         when(restTemplate.exchange(
-                eq(RegistryType.GITHUB.getReadmeUrl()),
+                eq("https://api.github.com/repos/Apophis/Chulak/contents/README.md?ref=master"),
                 eq(HttpMethod.GET),
                 requestCaptor.capture(),
-                eq(RegistryFile.class),
-                eq("123"))).thenReturn(response);
+                eq(RegistryFile.class))).thenReturn(response);
 
         // when
         var result = gitHubRawContent.getReadme(module);
diff --git a/src/test/java/io/codeka/gaia/registries/gitlab/GitLabRawContentTest.java b/src/test/java/io/codeka/gaia/registries/gitlab/GitLabRawContentTest.java
index b4522f211..4c96af8a7 100644
--- a/src/test/java/io/codeka/gaia/registries/gitlab/GitLabRawContentTest.java
+++ b/src/test/java/io/codeka/gaia/registries/gitlab/GitLabRawContentTest.java
@@ -66,11 +66,10 @@ void getReadmeContent_shouldCallTheApi_andServeDecodedContent(){
         var response = new ResponseEntity<>(gitlabFile, HttpStatus.OK);
 
         when(restTemplate.exchange(
-                eq(RegistryType.GITLAB.getReadmeUrl()),
+                eq("https://gitlab.com/api/v4/projects/123/repository/files/README.md?ref=master"),
                 eq(HttpMethod.GET),
                 requestCaptor.capture(),
-                eq(RegistryFile.class),
-                eq("123"))).thenReturn(response);
+                eq(RegistryFile.class))).thenReturn(response);
 
         // when
         var result = gitLabRawContent.getReadme(module);
@@ -109,11 +108,10 @@ void getReadmeContent_shouldReturnEmpty_whenReadmeDoesntExists(){
         var response = new ResponseEntity<RegistryFile>(HttpStatus.NOT_FOUND);
 
         when(restTemplate.exchange(
-                eq(RegistryType.GITLAB.getReadmeUrl()),
+                eq("https://gitlab.com/api/v4/projects/123/repository/files/README.md?ref=master"),
                 eq(HttpMethod.GET),
                 requestCaptor.capture(),
-                eq(RegistryFile.class),
-                eq("123"))).thenReturn(response);
+                eq(RegistryFile.class))).thenReturn(response);
 
         // when
         var result = gitLabRawContent.getReadme(module);