diff --git a/infrastructure/clojure/build.py b/infrastructure/clojure/build.py
index 036592c..c3d89d2 100644
--- a/infrastructure/clojure/build.py
+++ b/infrastructure/clojure/build.py
@@ -2,8 +2,8 @@ from os import environ
 from pybuilder.core import task, init
 from ddadevops import *
 
-name = "ddabuild"
-MODULE = "clojure"
+name = "clojure"
+MODULE = "image"
 PROJECT_ROOT_PATH = "../.."
 
 
diff --git a/infrastructure/devops-build/build.py b/infrastructure/devops-build/build.py
index 488d160..4dd891e 100644
--- a/infrastructure/devops-build/build.py
+++ b/infrastructure/devops-build/build.py
@@ -3,38 +3,25 @@ from pybuilder.core import task, init
 from ddadevops import *
 
 name = "devops-build"
-MODULE = "docker"
+MODULE = "image"
 PROJECT_ROOT_PATH = "../.."
 
 
 @init
 def initialize(project):
+
+    input = {
+        "name": name,
+        "module": MODULE,
+        "stage": "notused",
+        "project_root_path": PROJECT_ROOT_PATH,
+        "build_types": ["IMAGE"],
+        "mixin_types": [],
+    }
+
     project.build_depends_on("ddadevops>=4.0.0-dev")
-    stage = "notused"
-    dockerhub_user = environ.get("DOCKERHUB_USER")
-    if not dockerhub_user:
-        dockerhub_user = gopass_field_from_path("meissa/web/docker.com", "login")
-    dockerhub_password = environ.get("DOCKERHUB_PASSWORD")
-    if not dockerhub_password:
-        dockerhub_password = gopass_password_from_path("meissa/web/docker.com")
-    tag = environ.get("CI_COMMIT_TAG")
-    if not tag:
-        tag = get_tag_from_latest_commit()
-
-    devops = Devops(
-        stage=stage,
-        project_root_path=PROJECT_ROOT_PATH,
-        module=MODULE,
-        name=name,
-    )
-    image = Image(
-        dockerhub_user=dockerhub_user,
-        dockerhub_password=dockerhub_password,
-        docker_publish_tag=tag,
-        devops=devops,
-    )
-
-    build = DevopsImageBuild(project, image=image)
+    
+    build = DevopsImageBuild(project, input)
     build.initialize_build_dir()