diff --git a/extra/modules/wurfl-devicedetection/src/main/java/org/prebid/server/hooks/modules/com/scientiamobile/wurfl/devicedetection/config/WURFLDeviceDetectionConfigProperties.java b/extra/modules/wurfl-devicedetection/src/main/java/org/prebid/server/hooks/modules/com/scientiamobile/wurfl/devicedetection/config/WURFLDeviceDetectionConfigProperties.java
index 085417d5455..4012f6533bb 100644
--- a/extra/modules/wurfl-devicedetection/src/main/java/org/prebid/server/hooks/modules/com/scientiamobile/wurfl/devicedetection/config/WURFLDeviceDetectionConfigProperties.java
+++ b/extra/modules/wurfl-devicedetection/src/main/java/org/prebid/server/hooks/modules/com/scientiamobile/wurfl/devicedetection/config/WURFLDeviceDetectionConfigProperties.java
@@ -6,9 +6,7 @@
 
 import java.util.Set;
 
-@ConfigurationProperties(prefix = "hooks.modules." + WURFLDeviceDetectionModule.CODE)
 @Data
-
 public class WURFLDeviceDetectionConfigProperties {
 
     private static final int DEFAULT_UPDATE_TIMEOUT = 5000;
diff --git a/extra/modules/wurfl-devicedetection/src/main/java/org/prebid/server/hooks/modules/com/scientiamobile/wurfl/devicedetection/config/WURFLDeviceDetectionConfiguration.java b/extra/modules/wurfl-devicedetection/src/main/java/org/prebid/server/hooks/modules/com/scientiamobile/wurfl/devicedetection/config/WURFLDeviceDetectionConfiguration.java
index 7338a53f83b..8366d1a27ea 100644
--- a/extra/modules/wurfl-devicedetection/src/main/java/org/prebid/server/hooks/modules/com/scientiamobile/wurfl/devicedetection/config/WURFLDeviceDetectionConfiguration.java
+++ b/extra/modules/wurfl-devicedetection/src/main/java/org/prebid/server/hooks/modules/com/scientiamobile/wurfl/devicedetection/config/WURFLDeviceDetectionConfiguration.java
@@ -6,6 +6,7 @@
 import org.prebid.server.hooks.modules.com.scientiamobile.wurfl.devicedetection.v1.WURFLDeviceDetectionModule;
 import org.prebid.server.hooks.modules.com.scientiamobile.wurfl.devicedetection.v1.WURFLDeviceDetectionRawAuctionRequestHook;
 import org.prebid.server.hooks.modules.com.scientiamobile.wurfl.devicedetection.v1.WURFLService;
+import org.prebid.server.hooks.modules.com.scientiamobile.wurfl.devicedetection.config.WURFLDeviceDetectionConfigProperties;
 import org.prebid.server.spring.env.YamlPropertySourceFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
@@ -17,20 +18,24 @@
 import org.prebid.server.spring.config.model.FileSyncerProperties;
 import org.prebid.server.spring.config.model.HttpClientProperties;
 import org.prebid.server.execution.file.FileUtil;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
 
 import java.nio.file.Path;
 import java.util.List;
 
 @ConditionalOnProperty(prefix = "hooks." + WURFLDeviceDetectionModule.CODE, name = "enabled", havingValue = "true")
 @Configuration
-@PropertySource(
-        value = "classpath:/module-config/wurfl-devicedetection.yaml",
-        factory = YamlPropertySourceFactory.class)
-@EnableConfigurationProperties(WURFLDeviceDetectionConfigProperties.class)
 public class WURFLDeviceDetectionConfiguration {
 
     private static final Long DAILY_SYNC_INTERVAL = 86400000L;
 
+    @Bean
+    @ConfigurationProperties(prefix = "hooks.modules." + WURFLDeviceDetectionModule.CODE)
+    WURFLDeviceDetectionConfigProperties configProperties() {
+        return new WURFLDeviceDetectionConfigProperties();
+    }
+
     @Bean
     public WURFLDeviceDetectionModule wurflDeviceDetectionModule(WURFLDeviceDetectionConfigProperties
                                                                          configProperties, Vertx vertx) {
diff --git a/extra/modules/wurfl-devicedetection/src/main/resources/module-config/wurfl-devicedetection.yaml b/extra/modules/wurfl-devicedetection/src/main/resources/module-config/wurfl-devicedetection.yaml
deleted file mode 100644
index c2a26767922..00000000000
--- a/extra/modules/wurfl-devicedetection/src/main/resources/module-config/wurfl-devicedetection.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-hooks:
-  wurfl-devicedetection:
-    enabled: true
-  host-execution-plan: >
-    {
-      "endpoints": {
-        "/openrtb2/auction": {
-          "stages": {
-            "entrypoint": {
-              "groups": [
-                {
-                  "timeout": 10,
-                  "hook_sequence": [
-                    {
-                      "module_code": "wurfl-devicedetection",
-                      "hook_impl_code": "wurfl-devicedetection-entrypoint-hook"
-                    }
-                  ]
-                }
-              ]
-            },
-            "raw_auction_request": {
-              "groups": [
-                {
-                  "timeout": 10,
-                  "hook_sequence": [
-                    {
-                      "module_code": "wurfl-devicedetection",
-                      "hook_impl_code": "wurfl-devicedetection-raw-auction-request"
-                    }
-                  ]
-                }
-              ]
-            }
-          }
-        }
-      }
-    }
-  modules:
-    wurfl-devicedetection:
-      wurfl-file-dir-path: </path/to/wurfl_snapshot_dir>
-      wurfl-snapshot-url: https://data.scientiamobile.com/your_wurfl_snapshot_url/wurfl.zip
-      cache-size: 200000
-      wurfl-run-updater: true
-      allowed-publisher-ids: 1
-      ext-caps: true
diff --git a/sample/configs/prebid-config-with-wurfl.yaml b/sample/configs/prebid-config-with-wurfl.yaml
index c9f6b1d63d2..83e2389c059 100644
--- a/sample/configs/prebid-config-with-wurfl.yaml
+++ b/sample/configs/prebid-config-with-wurfl.yaml
@@ -78,3 +78,12 @@ hooks:
       }
     }
 
+
+  modules:
+    wurfl-devicedetection:
+      wurfl-file-dir-path: </path/to/wurfl_snapshot_dir>
+      wurfl-snapshot-url: https://data.scientiamobile.com/your_wurfl_snapshot_url/wurfl.zip
+      cache-size: 200000
+      wurfl-run-updater: true
+      allowed-publisher-ids: 1
+      ext-caps: true