diff --git a/winegrower-core/src/main/java/org/apache/winegrower/service/OSGiServices.java b/winegrower-core/src/main/java/org/apache/winegrower/service/OSGiServices.java
index 6bf6b26..57f7ce9 100644
--- a/winegrower-core/src/main/java/org/apache/winegrower/service/OSGiServices.java
+++ b/winegrower-core/src/main/java/org/apache/winegrower/service/OSGiServices.java
@@ -156,6 +156,12 @@
             @Override
             public Object get(final Object key) {
                 final String property = System.getProperty(String.valueOf(key));
+                if ("*".equals(property)) { // http.port for ex
+                    final Object overridenValue = super.get(key);
+                    if (overridenValue != null) {
+                        return overridenValue;
+                    }
+                }
                 return property != null ? property : super.get(key);
             }
         };