diff --git a/docker-compose.yml b/docker-compose.yml
index 6c8cf37..a88a062 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
       - nio_zookeeper
     environment:
       KAFKA_BROKER_ID: 1
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper:32181
+      KAFKA_ZOOKEEPER_CONNECT: nio_zookeeper:32181
       KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://localhost:29092
       KAFKA_AUTO_CREATE_TOPICS_ENABLE: "true"
       KAFKA_DELETE_TOPIC_ENABLE: "true"
diff --git a/nio-server/app/controllers/ConsentController.scala b/nio-server/app/controllers/ConsentController.scala
index ec02be2..8864a0c 100644
--- a/nio-server/app/controllers/ConsentController.scala
+++ b/nio-server/app/controllers/ConsentController.scala
@@ -86,7 +86,7 @@ class ConsentController(
                   key = pg.key,
                   label = pg.label,
                   consents = pg.permissions.map { p =>
-                    Consent(key = p.key, label = p.label, checked = p.checkDefault(), expiredAt = p.getValidityPeriod)
+                    Consent(key = p.key, label = p.label, checked = p.checkDefault(), expiredAt = None)
                   }
                 )
 
diff --git a/nio-server/app/service/ConsentManagerService.scala b/nio-server/app/service/ConsentManagerService.scala
index 5fd3db3..68793d0 100644
--- a/nio-server/app/service/ConsentManagerService.scala
+++ b/nio-server/app/service/ConsentManagerService.scala
@@ -394,7 +394,8 @@ class ConsentManagerService(
           }
           .getOrElse(group)
 
-    val consentFactFiltered = consentFact.filterExpiredConsent(true)
+    val consentFactFiltered = consentFact.filterExpiredConsent(false)
+
     val groupsUpdated: Seq[ConsentGroup] =
       template.groups.map { group =>
         val maybeGroup = consentFactFiltered.groups