diff --git a/Makefile b/Makefile
index 76ec513c86f4df303f62e7d9861b2eae16289be3..f4dad4276bce69c3db281ef3ee32c4b2a6a1c550 100644
--- a/Makefile
+++ b/Makefile
@@ -25,8 +25,8 @@ fix:
 	$(POETRY) run black tests
 
 gr runner gitlab-runner:
-	gitlab-runner exec docker build
-	gitlab-runner exec docker deploy
+	gitlab-runner exec docker build --env BITIA_SERVER=$$BITIA_SERVER
+	gitlab-runner exec docker deploy --env BITIA_SERVER=$$BITIA_SERVER
 
 release:
 	rm -rf dist/*.whl
diff --git a/bitia/__main__.py b/bitia/__main__.py
index 56268a47f93a9430cca05235059ac776d1efc559..0115002f45d05d7c5cf933b4ec3ec375f410f30f 100644
--- a/bitia/__main__.py
+++ b/bitia/__main__.py
@@ -176,7 +176,7 @@ def main(
 
     if server is not None:
         bconfig.set_server(server)
-    elif os.environ.get("BITIA_SERVER") is not None:
+    elif os.environ.get("BITIA_SERVER"):
         bconfig.set_server(os.environ["BITIA_SERVER"])
     else:
         # TODO: Read from default config file.
diff --git a/bitia/config.py b/bitia/config.py
index 66e427530803688240e20d1d7c044e81b68a8925..44ec8e5354fcbef5d0f0b3f71b9ef82a304c612d 100644
--- a/bitia/config.py
+++ b/bitia/config.py
@@ -3,6 +3,8 @@ import typing as T
 from pathlib import Path
 import tempfile
 
+import validators
+
 BITIA_MAIN_SCRIPT_NAME: T.Final[str] = "__main__.bitia.sh"
 
 
@@ -34,4 +36,5 @@ def get_server(use_env: bool = True) -> str:
 
 def set_server(server: str):
     """set bitia server"""
+    assert validators.url(server), f"{server} is not a valid url"
     set_config("server", server)
diff --git a/bitia/helper.py b/bitia/helper.py
index e4a2cd932108012f49eaad07b6e0bbe0d68033b3..52c3c0580ce90f1b7faf910c8362e91036f625e0 100644
--- a/bitia/helper.py
+++ b/bitia/helper.py
@@ -3,23 +3,14 @@
 __author__ = "Dilawar Singh"
 __email__ = "dilawar@subcom.tech"
 
-import hashlib
 import sys
-import uuid
-import zipfile
-import shutil
 from pathlib import Path
-from datetime import datetime
-import tempfile
 import typing as T
 
-import validators
 import requests
 
-import bitia.config as bconfig
 import bitia.session as bsession
 from bitia.pipeline import Pipeline
-from bitia.checksumdir import dirhash
 from bitia.logger import logger