diff --git a/stack-orchestrator/compose/docker-compose-laconic-console.yml b/stack-orchestrator/compose/docker-compose-laconic-console.yml
index ec97b53..12df9a4 100644
--- a/stack-orchestrator/compose/docker-compose-laconic-console.yml
+++ b/stack-orchestrator/compose/docker-compose-laconic-console.yml
@@ -1,6 +1,6 @@
 services:
   cli:
-    image: cerc/laconic2-registry-cli:local
+    image: cerc/laconic-registry-cli:local
     command: ["bash", "-c", "/app/create-config.sh && tail -f /dev/null"]
     environment:
       CERC_LACONICD_RPC_ENDPOINT: ${CERC_LACONICD_RPC_ENDPOINT:-http://laconicd:26657}
@@ -18,7 +18,7 @@ services:
 
   console:
     restart: unless-stopped
-    image: cerc/laconic2-console-host:local
+    image: cerc/laconic-console-host:local
     environment:
       CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
       CERC_WEBAPP_FILES_DIR: ${CERC_WEBAPP_FILES_DIR:-/usr/local/share/.config/yarn/global/node_modules/@cerc-io/console-app/dist/production}
diff --git a/stack-orchestrator/compose/docker-compose-testnet-laconicd.yml b/stack-orchestrator/compose/docker-compose-testnet-laconicd.yml
index 1f11c95..fc7c70e 100644
--- a/stack-orchestrator/compose/docker-compose-testnet-laconicd.yml
+++ b/stack-orchestrator/compose/docker-compose-testnet-laconicd.yml
@@ -1,7 +1,7 @@
 services:
   laconicd:
     restart: unless-stopped
-    image: cerc/laconic2d:local
+    image: cerc/laconicd:local
     command: ["bash", "-c", "/opt/run-laconicd.sh"]
     environment:
       CERC_MONIKER: ${CERC_MONIKER:-TestnetNode}
diff --git a/stack-orchestrator/container-build/cerc-laconic2-console-host/Dockerfile b/stack-orchestrator/container-build/cerc-laconic-console-host/Dockerfile
similarity index 100%
rename from stack-orchestrator/container-build/cerc-laconic2-console-host/Dockerfile
rename to stack-orchestrator/container-build/cerc-laconic-console-host/Dockerfile
diff --git a/stack-orchestrator/container-build/cerc-laconic2-console-host/build.sh b/stack-orchestrator/container-build/cerc-laconic-console-host/build.sh
similarity index 54%
rename from stack-orchestrator/container-build/cerc-laconic2-console-host/build.sh
rename to stack-orchestrator/container-build/cerc-laconic-console-host/build.sh
index ef43944..bb4e198 100755
--- a/stack-orchestrator/container-build/cerc-laconic2-console-host/build.sh
+++ b/stack-orchestrator/container-build/cerc-laconic-console-host/build.sh
@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 
-# Build cerc/laconic2-console-host
+# Build cerc/laconic-console-host
 
 source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
 
 # See: https://stackoverflow.com/a/246128/1701505
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
-docker build -t cerc/laconic2-console-host:local ${build_command_args} -f ${SCRIPT_DIR}/Dockerfile ${CERC_REPO_BASE_DIR}/laconic-console
+docker build -t cerc/laconic-console-host:local ${build_command_args} -f ${SCRIPT_DIR}/Dockerfile ${CERC_REPO_BASE_DIR}/laconic-console
diff --git a/stack-orchestrator/container-build/cerc-laconic2-registry-cli/Dockerfile b/stack-orchestrator/container-build/cerc-laconic-registry-cli/Dockerfile
similarity index 100%
rename from stack-orchestrator/container-build/cerc-laconic2-registry-cli/Dockerfile
rename to stack-orchestrator/container-build/cerc-laconic-registry-cli/Dockerfile
diff --git a/stack-orchestrator/container-build/cerc-laconic2-registry-cli/build.sh b/stack-orchestrator/container-build/cerc-laconic-registry-cli/build.sh
similarity index 53%
rename from stack-orchestrator/container-build/cerc-laconic2-registry-cli/build.sh
rename to stack-orchestrator/container-build/cerc-laconic-registry-cli/build.sh
index 0c775dc..9483ec1 100755
--- a/stack-orchestrator/container-build/cerc-laconic2-registry-cli/build.sh
+++ b/stack-orchestrator/container-build/cerc-laconic-registry-cli/build.sh
@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 
-# Build cerc/laconic2-registry-cli
+# Build cerc/laconic-registry-cli
 source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
 
 # See: https://stackoverflow.com/a/246128/1701505
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
-docker build -t cerc/laconic2-registry-cli:local ${build_command_args} -f ${SCRIPT_DIR}/Dockerfile ${CERC_REPO_BASE_DIR}/laconic-registry-cli
+docker build -t cerc/laconic-registry-cli:local ${build_command_args} -f ${SCRIPT_DIR}/Dockerfile ${CERC_REPO_BASE_DIR}/laconic-registry-cli
diff --git a/stack-orchestrator/container-build/cerc-laconic2d/build.sh b/stack-orchestrator/container-build/cerc-laconic2d/build.sh
deleted file mode 100755
index 2265c85..0000000
--- a/stack-orchestrator/container-build/cerc-laconic2d/build.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-# Build cerc/laconic2d
-source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-docker build -t cerc/laconic2d:local ${build_command_args} ${CERC_REPO_BASE_DIR}/laconic2d
diff --git a/stack-orchestrator/container-build/cerc-laconicd/build.sh b/stack-orchestrator/container-build/cerc-laconicd/build.sh
new file mode 100755
index 0000000..65bab74
--- /dev/null
+++ b/stack-orchestrator/container-build/cerc-laconicd/build.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+# Build cerc/laconicd
+source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
+docker build -t cerc/laconicd:local ${build_command_args} ${CERC_REPO_BASE_DIR}/laconicd
diff --git a/stack-orchestrator/stacks/laconic-console/README.md b/stack-orchestrator/stacks/laconic-console/README.md
index 3513bf2..5616ca1 100644
--- a/stack-orchestrator/stacks/laconic-console/README.md
+++ b/stack-orchestrator/stacks/laconic-console/README.md
@@ -28,9 +28,9 @@ Instructions for running laconic registry CLI and console
 
   This should create the following docker images locally:
 
-  * `cerc/laconic2-registry-cli`
+  * `cerc/laconic-registry-cli`
   * `cerc/webapp-base`
-  * `cerc/laconic2-console-host`
+  * `cerc/laconic-console-host`
 
 ## Create a deployment
 
diff --git a/stack-orchestrator/stacks/laconic-console/stack.yml b/stack-orchestrator/stacks/laconic-console/stack.yml
index f03007f..0e657df 100644
--- a/stack-orchestrator/stacks/laconic-console/stack.yml
+++ b/stack-orchestrator/stacks/laconic-console/stack.yml
@@ -2,11 +2,11 @@ version: "1.0"
 name: laconic-console
 description: "Laconic registry CLI and console"
 repos:
-  - git.vdb.to/cerc-io/laconic-registry-cli@laconic2
-  - git.vdb.to/cerc-io/laconic-console@laconic2
+  - git.vdb.to/cerc-io/laconic-registry-cli
+  - git.vdb.to/cerc-io/laconic-console
 containers:
-  - cerc/laconic2-registry-cli
+  - cerc/laconic-registry-cli
   - cerc/webapp-base
-  - cerc/laconic2-console-host
+  - cerc/laconic-console-host
 pods:
   - laconic-console
diff --git a/stack-orchestrator/stacks/testnet-laconicd/README.md b/stack-orchestrator/stacks/testnet-laconicd/README.md
index c7b32ff..6ae04a3 100644
--- a/stack-orchestrator/stacks/testnet-laconicd/README.md
+++ b/stack-orchestrator/stacks/testnet-laconicd/README.md
@@ -46,10 +46,10 @@ Instructions for running a laconicd testnet full node and joining as a validator
 
   This should create the following docker images locally:
 
-  * `cerc/laconic2d`
-  * `cerc/laconic2-registry-cli`
+  * `cerc/laconicd`
+  * `cerc/laconic-registry-cli`
   * `cerc/webapp-base`
-  * `cerc/laconic2-console-host`
+  * `cerc/laconic-console-host`
 
 ## Create a deployment
 
diff --git a/stack-orchestrator/stacks/testnet-laconicd/stack.yml b/stack-orchestrator/stacks/testnet-laconicd/stack.yml
index 82252ba..7132e7f 100644
--- a/stack-orchestrator/stacks/testnet-laconicd/stack.yml
+++ b/stack-orchestrator/stacks/testnet-laconicd/stack.yml
@@ -2,8 +2,8 @@ version: "1.0"
 name: testnet-laconicd
 description: "Laconicd full node"
 repos:
-  - git.vdb.to/cerc-io/laconic2d
+  - git.vdb.to/cerc-io/laconicd
 containers:
-  - cerc/laconic2d
+  - cerc/laconicd
 pods:
   - testnet-laconicd