diff --git a/.env.ci-app b/.env.ci-app
index 77041e9ff..eba9f1456 100644
Binary files a/.env.ci-app and b/.env.ci-app differ
diff --git a/src/main/java/org/patinanetwork/codebloom/CodebloomApplication.java b/src/main/java/org/patinanetwork/codebloom/CodebloomApplication.java
index 973e4f40a..eb8447921 100644
--- a/src/main/java/org/patinanetwork/codebloom/CodebloomApplication.java
+++ b/src/main/java/org/patinanetwork/codebloom/CodebloomApplication.java
@@ -4,10 +4,8 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
-@EnableScheduling
 @EnableAsync
 @Slf4j
 public class CodebloomApplication {
diff --git a/src/main/java/org/patinanetwork/codebloom/config/SchedulingConfiguration.java b/src/main/java/org/patinanetwork/codebloom/config/SchedulingConfiguration.java
new file mode 100644
index 000000000..30f7b7a44
--- /dev/null
+++ b/src/main/java/org/patinanetwork/codebloom/config/SchedulingConfiguration.java
@@ -0,0 +1,10 @@
+package org.patinanetwork.codebloom.config;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+@Configuration
+@EnableScheduling
+@ConditionalOnProperty(prefix = "codebloom.scheduling", name = "enabled", havingValue = "true", matchIfMissing = true)
+public class SchedulingConfiguration {}
diff --git a/src/main/java/org/patinanetwork/codebloom/scheduled/pg/NotifyListener.java b/src/main/java/org/patinanetwork/codebloom/scheduled/pg/NotifyListener.java
index b5856fa07..0fa32bf9c 100644
--- a/src/main/java/org/patinanetwork/codebloom/scheduled/pg/NotifyListener.java
+++ b/src/main/java/org/patinanetwork/codebloom/scheduled/pg/NotifyListener.java
@@ -17,12 +17,14 @@
 import org.patinanetwork.codebloom.scheduled.pg.handler.LobbyNotifyHandler;
 import org.postgresql.PGConnection;
 import org.postgresql.PGNotification;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
 
 @Component
 @Slf4j
 @Profile("!ci | thread")
+@ConditionalOnProperty(prefix = "codebloom.notify", name = "enabled", havingValue = "true", matchIfMissing = true)
 public class NotifyListener {
 
     private final ExecutorService vtpool;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3f3d29cf3..b45144ceb 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -91,6 +91,10 @@ codebloom:
     type: ${CODEBLOOM_EMAIL_TYPE}
     username: ${CODEBLOOM_EMAIL_USERNAME}
     password: ${CODEBLOOM_EMAIL_PASSWORD}
+  scheduling:
+    enabled: true
+  notify:
+    enabled: true
 
 management:
   endpoints: