diff --git a/Makefile b/Makefile
index e0b4d9c..eb14ceb 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,13 @@ build: clean
 run:
 	bee run -gendoc=true -downdoc=true
 
-dev:
-	bee generate routers && HTTPPORT=8091 bee run -gendoc=true -downdoc=true
+purge:
+	lsof -t -i:8091 | xargs kill | true
+
+run-dev:
+	bee generate routers && bee run -gendoc=true -downdoc=true -runmode=prod
+
+dev: purge run-dev
 
 debug:
 	bee run -downdebug -gendebug
@@ -27,4 +32,4 @@ publish-registry:
 
 all: docker publish-kind publish-registry
 
-.PHONY: build run clean docker publish-kind publish-registry
\ No newline at end of file
+.PHONY: build run clean docker publish-kind publish-registry
diff --git a/controllers/version.go b/controllers/version.go
index 1f7ae37..ccf1f0b 100644
--- a/controllers/version.go
+++ b/controllers/version.go
@@ -15,7 +15,10 @@ type VersionController struct {
 // @Success 200
 // @router / [get]
 func (c *VersionController) GetAll() {
-	c.Data["json"] = map[string]string{"version": "1"}
+	c.Data["json"] = map[string]string{
+		"service": "oc-shared",
+		"version": "1",
+	}
 	c.ServeJSON()
 }
 
diff --git a/docker-compose.base.yml b/docker-compose.base.yml
deleted file mode 100644
index cefe5d6..0000000
--- a/docker-compose.base.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-version: '3.4'
-
-services:
-  mongo:
-    image: 'mongo:latest'
-    networks: 
-      - catalog
-    ports:
-      - 27017:27017
-    container_name: mongo
-    volumes: 
-      - oc-catalog-data:/data/db
-      - oc-catalog-data:/data/configdb
-  
-  mongo-express:
-    image: "mongo-express:latest"
-    restart: always
-    depends_on: 
-      - mongo
-    networks: 
-      - catalog
-    ports:
-      - 8081:8081
-    environment:
-      - ME_CONFIG_BASICAUTH_USERNAME=test
-      - ME_CONFIG_BASICAUTH_PASSWORD=test
-
-volumes:
-  oc-catalog-data:
-
-networks: 
-  catalog:
-    external: true
-    # name: catalog
diff --git a/docker-compose.yml b/docker-compose.yml
index e8bd1c0..0170e8c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,8 +18,8 @@ services:
         - "traefik.http.services.shared.loadbalancer.server.port=8080"
         - "traefik.http.middlewares.shared.forwardauth.address=http://oc-auth:8080/oc/forward"
     networks: 
-      - catalog
+      - oc
 
 networks: 
-  catalog:
+  oc:
     external: true
\ No newline at end of file
diff --git a/main.go b/main.go
index 53331f7..1e2b4ce 100644
--- a/main.go
+++ b/main.go
@@ -11,8 +11,26 @@ import (
 const appname = "oc-shared"
 
 func main() {
+	// Init the oc-lib
 	// Init the oc-lib
 	oclib.Init(appname)
+
+	// Load the right config file
+	o := oclib.GetConfLoader()
+
+	// feed the library with the loaded config
+	oclib.SetConfig(
+		o.GetStringDefault("MONGO_URL", "mongodb://127.0.0.1:27017"),
+		o.GetStringDefault("MONGO_DATABASE", "DC_myDC"),
+		o.GetStringDefault("NATS_URL", "nats://localhost:4222"),
+		o.GetStringDefault("LOKI_URL", ""),
+		o.GetStringDefault("LOG_LEVEL", "info"),
+	)
+	// Beego init
+	beego.BConfig.AppName = appname
+	beego.BConfig.Listen.HTTPPort = o.GetIntDefault("port", 8080)
+	beego.BConfig.WebConfig.DirectoryIndex = true
+	beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger"
 	beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{
 		AllowAllOrigins:  true,
 		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
@@ -20,5 +38,6 @@ func main() {
 		ExposeHeaders:    []string{"Content-Length", "Content-Type"},
 		AllowCredentials: true,
 	}))
+
 	beego.Run()
 }
diff --git a/oc-shared b/oc-shared
new file mode 100755
index 0000000..5bd1bc0
Binary files /dev/null and b/oc-shared differ
diff --git a/shared.json b/shared.json
index aa673e5..db4c7bd 100644
--- a/shared.json
+++ b/shared.json
@@ -1,5 +1,5 @@
 {
-    "port":8080,
+    "port":8091,
     "MONGO_URL":"mongodb://localhost:27017/", 
     "MONGO_DATABASE":"DC_myDC"
 }
\ No newline at end of file