diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f01e45d4db8b58a93f072c024cfe01baa81b7261..6dae9acc6dcedb8d0d9f69e3171f27945098ba0a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ before_script:
 
 build:
     stage: build
-    script: docker build --no-cache -t registry-gitlab.xlab.si/cyberwiser/$SERVICE:$VERSION .
+    script: docker build --no-cache -t registry-gitlab.xlab.si/medina/$SERVICE:$VERSION .
 
 test:
     stage: test
@@ -20,7 +20,7 @@ test:
     - docker run --rm -d --network=test-genscan --name dvwa vulnerables/web-dvwa
     - echo '{"target":{"url":"http://dvwa/","ip":"dvwa"},"config":{"w3af":{"profile":"fast_scan"},"zap":{"profile":"basic"},"nmap":{"profile":"basic_discovery"}}}' > /tmp/config-genscan.json
     - mkdir /tmp/out
-    - docker run --rm --network=test-genscan -v /tmp/config-genscan.json:/root/config.json -v /tmp/out:/root/out registry-gitlab.xlab.si/cyberwiser/$SERVICE:$VERSION
+    - docker run --rm --network=test-genscan -v /tmp/config-genscan.json:/root/config.json -v /tmp/out:/root/out registry-gitlab.xlab.si/medina/$SERVICE:$VERSION
     - cat /tmp/out/cscan-log.txt
     - grep -q "W3af" /tmp/out/genscan-out.json
     - grep -q "OWASP ZAP" /tmp/out/genscan-out.json
@@ -36,9 +36,9 @@ push:
     stage: push
     script:
     - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry-gitlab.xlab.si
-    - docker tag registry-gitlab.xlab.si/cyberwiser/$SERVICE:$VERSION registry-gitlab.xlab.si/cyberwiser/$SERVICE:latest
-    - docker push registry-gitlab.xlab.si/cyberwiser/$SERVICE:$VERSION
-    - docker push registry-gitlab.xlab.si/cyberwiser/$SERVICE:latest
+    - docker tag registry-gitlab.xlab.si/medina/$SERVICE:$VERSION registry-gitlab.xlab.si/medina/$SERVICE:latest
+    - docker push registry-gitlab.xlab.si/medina/$SERVICE:$VERSION
+    - docker push registry-gitlab.xlab.si/medina/$SERVICE:latest
     - docker logout registry.gitlab.xlab.si
     only:
     - master
diff --git a/Makefile b/Makefile
index b7846c118e547d0483177e55ae9b3223dca18fe3..cb2a90df4f35dc165b539344c1ef991ba4e56d3f 100644
--- a/Makefile
+++ b/Makefile
@@ -8,14 +8,14 @@ VERSION = $(shell grep VERSION MANIFEST | cut -d '=' -f2)
 TEST_DIR = /tmp/test-$(SERVICE)-$(VERSION)-$(shell date +%s)/
 
 build:
-	docker build -t registry-gitlab.xlab.si/cyberwiser/$(SERVICE):$(VERSION) .
+	docker build -t registry-gitlab.xlab.si/medina/$(SERVICE):$(VERSION) .
 
 test:
 	docker network create test-genscan
 	docker run --rm -d --network=test-genscan --name dvwa vulnerables/web-dvwa
 	mkdir $(TEST_DIR)
 	echo '{"target":{"url":"http://dvwa/","ip":"dvwa"},"config":{"w3af":{"profile":"fast_scan"},"zap":{"profile":"basic"},"nmap":{"profile":"basic_discovery"}}}' > $(TEST_DIR)config.json
-	docker run --rm --network=test-genscan -v $(TEST_DIR)config.json:/root/config.json -v $(TEST_DIR):/root/out/ registry-gitlab.xlab.si/cyberwiser/$(SERVICE):$(VERSION)
+	docker run --rm --network=test-genscan -v $(TEST_DIR)config.json:/root/config.json -v $(TEST_DIR):/root/out/ registry-gitlab.xlab.si/medina/$(SERVICE):$(VERSION)
 	docker kill dvwa
 	docker network rm test-genscan
 	grep -q "W3af" $(TEST_DIR)genscan-out.json
@@ -24,7 +24,7 @@ test:
 
 start:
 ifdef OUTPUT_DIR
-	docker run -e TARGET=$(TARGET) -v $(OUTPUT_DIR):/root/out/ registry-gitlab.xlab.si/cyberwiser/$(SERVICE):$(VERSION)
+	docker run -e TARGET=$(TARGET) -v $(OUTPUT_DIR):/root/out/ registry-gitlab.xlab.si/medina/$(SERVICE):$(VERSION)
 else
-	docker run -e TARGET=$(TARGET) registry-gitlab.xlab.si/cyberwiser/$(SERVICE):$(VERSION)
+	docker run -e TARGET=$(TARGET) registry-gitlab.xlab.si/medina/$(SERVICE):$(VERSION)
 endif
diff --git a/README.md b/README.md
index b936ffd99c1e2e87fac95686d8e2f36b3ad9234a..6ed723cf83724946f43e8066b2666525b0caf983 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,9 @@
 ## Generic suite of scanners for VAT using [cscan] wrapped around [ZAP] and [w3af]
+
+Author: XLAB
+
+---
+
 Currently supports only basic (fast) scans without any configuration.
 
 ### Usage: