diff --git a/src/main/java/io/codeka/gaia/modules/bo/TerraformModule.java b/src/main/java/io/codeka/gaia/modules/bo/TerraformModule.java
index 14be9b2de..906b88a10 100644
--- a/src/main/java/io/codeka/gaia/modules/bo/TerraformModule.java
+++ b/src/main/java/io/codeka/gaia/modules/bo/TerraformModule.java
@@ -8,6 +8,7 @@
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -43,6 +44,8 @@ public class TerraformModule {
     @DBRef
     private User createdBy;
 
+    private LocalDateTime createdAt = LocalDateTime.now();
+
     private RegistryDetails registryDetails;
 
     public String getId() {
@@ -152,4 +155,12 @@ public RegistryDetails getRegistryDetails() {
     public void setRegistryDetails(RegistryDetails registryDetails) {
         this.registryDetails = registryDetails;
     }
+
+    public LocalDateTime getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(LocalDateTime createdAt) {
+        this.createdAt = createdAt;
+    }
 }
diff --git a/src/main/resources/templates/module_description.html b/src/main/resources/templates/module_description.html
index 9937fd098..9b3f2e48e 100644
--- a/src/main/resources/templates/module_description.html
+++ b/src/main/resources/templates/module_description.html
@@ -110,7 +110,6 @@ <h1>
         .then(data => {
             // START FIXME: link with real data once implemented in the model
             data.mainProvider = 'aws';
-            data.createdAt = moment().subtract(10, 'days');
             data.updatedAt = moment();
             data.updatedBy = 'Douglas Riper';
             data.owner = 'Ze Team';
diff --git a/src/test/java/io/codeka/gaia/registries/controller/GithubRegistryControllerIT.kt b/src/test/java/io/codeka/gaia/registries/controller/GithubRegistryControllerIT.kt
index 4c9877454..ecf811c33 100644
--- a/src/test/java/io/codeka/gaia/registries/controller/GithubRegistryControllerIT.kt
+++ b/src/test/java/io/codeka/gaia/registries/controller/GithubRegistryControllerIT.kt
@@ -13,7 +13,6 @@ import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.autoconfigure.web.client.AutoConfigureWebClient
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.core.io.ClassPathResource
 import org.springframework.http.MediaType
@@ -22,11 +21,10 @@ import org.springframework.test.web.client.MockRestServiceServer
 import org.springframework.test.web.client.match.MockRestRequestMatchers
 import org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo
 import org.springframework.test.web.client.response.MockRestResponseCreators
-import org.springframework.test.web.servlet.MockMvc
 import org.springframework.web.client.RestTemplate
 import org.testcontainers.junit.jupiter.Container
 import org.testcontainers.junit.jupiter.Testcontainers
-import java.util.*
+import java.time.LocalDateTime
 
 @SpringBootTest
 @DirtiesContext
@@ -110,7 +108,9 @@ class GithubRegistryControllerIT{
 
         assertThat(importedModule.id).isNotBlank()
         assertThat(importedModule.name).isEqualTo("selmak/terraform-docker-mongo")
+
         assertThat(importedModule.createdBy).isEqualTo(selmak)
+        assertThat(importedModule.createdAt).isEqualToIgnoringSeconds(LocalDateTime.now())
 
         assertThat(importedModule.gitRepositoryUrl).isEqualTo("https://github.com/selmak/terraform-docker-mongo")
         assertThat(importedModule.registryDetails).isEqualTo(RegistryDetails(RegistryType.GITHUB, "selmak/terraform-docker-mongo"))
diff --git a/src/test/java/io/codeka/gaia/registries/controller/GitlabRegistryControllerIT.kt b/src/test/java/io/codeka/gaia/registries/controller/GitlabRegistryControllerIT.kt
index 3cc6035bd..657bac708 100644
--- a/src/test/java/io/codeka/gaia/registries/controller/GitlabRegistryControllerIT.kt
+++ b/src/test/java/io/codeka/gaia/registries/controller/GitlabRegistryControllerIT.kt
@@ -5,7 +5,6 @@ import io.codeka.gaia.modules.bo.Variable
 import io.codeka.gaia.modules.repository.TerraformModuleRepository
 import io.codeka.gaia.registries.RegistryDetails
 import io.codeka.gaia.registries.RegistryType
-import io.codeka.gaia.registries.github.GithubRepository
 import io.codeka.gaia.registries.gitlab.GitlabRepository
 import io.codeka.gaia.teams.OAuth2User
 import io.codeka.gaia.teams.User
@@ -14,7 +13,6 @@ import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.autoconfigure.web.client.AutoConfigureWebClient
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.core.io.ClassPathResource
 import org.springframework.http.MediaType
@@ -23,10 +21,10 @@ import org.springframework.test.web.client.MockRestServiceServer
 import org.springframework.test.web.client.match.MockRestRequestMatchers
 import org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo
 import org.springframework.test.web.client.response.MockRestResponseCreators
-import org.springframework.test.web.servlet.MockMvc
 import org.springframework.web.client.RestTemplate
 import org.testcontainers.junit.jupiter.Container
 import org.testcontainers.junit.jupiter.Testcontainers
+import java.time.LocalDateTime
 
 @SpringBootTest
 @DirtiesContext
@@ -105,7 +103,9 @@ class GitlabRegistryControllerIT{
 
         assertThat(importedModule.id).isNotBlank()
         assertThat(importedModule.name).isEqualTo("selmak/terraform-docker-mongo")
+
         assertThat(importedModule.createdBy).isEqualTo(selmak)
+        assertThat(importedModule.createdAt).isEqualToIgnoringSeconds(LocalDateTime.now())
 
         assertThat(importedModule.gitRepositoryUrl).isEqualTo("https://gitlab.com/selmak/terraform-docker-mongo")
         assertThat(importedModule.registryDetails).isEqualTo(RegistryDetails(RegistryType.GITLAB, "16181047"))