diff --git a/Makefile b/Makefile
index 40e7cc1..56924fd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,44 +1,44 @@
 export SOURCE_DATE_EPOCH = 0
 
 out/bootstrap.oci.tgz:
-	docker build -t ocirep/bootstrap --output type=oci,dest=$@ packages/bootstrap
+	docker build -t imgrep/bootstrap --output type=oci,dest=$@ packages/bootstrap
 
 out/musl.oci.tgz: \
 	out/bootstrap.oci.tgz
-	docker build -t ocirep/musl --output type=oci,dest=$@ packages/musl
+	docker build -t imgrep/musl --output type=oci,dest=$@ packages/musl
 
 out/busybox.oci.tgz: \
 	out/bootstrap.oci.tgz
-	docker build -t ocirep/busybox --output type=oci,dest=$@ packages/busybox
+	docker build -t imgrep/busybox --output type=oci,dest=$@ packages/busybox
 
 out/binutils.oci.tgz: \
 	out/bootstrap.oci.tgz \
 	out/musl.oci.tgz
-	docker build -t ocirep/musl --output type=oci,dest=$@ packages/musl
+	docker build -t imgrep/binutils --output type=oci,dest=$@ packages/binutils
 
-out/linux-headers.oci.tgz: \
-	docker build -t ocirep/linux-headers --output type=oci,dest=$@ packages/linux-heades
+out/linux-headers.oci.tgz:
+	docker build -t imgrep/linux-headers --output type=oci,dest=$@ packages/linux-headers
 
 out/gcc.oci.tgz: \
 	out/bootstrap.oci.tgz \
 	out/musl.oci.tgz
-	docker build -t ocirep/gcc --output type=oci,dest=$@ packages/gcc
+	docker build -t imgrep/gcc --output type=oci,dest=$@ packages/gcc
 
 out/make.oci.tgz: \
 	out/bootstrap.oci.tgz \
 	out/musl.oci.tgz
-	docker build -t ocirep/make --output type=oci,dest=$@ packages/make
+	docker build -t imgrep/make --output type=oci,dest=$@ packages/make
 
 out/bash.oci.tgz: \
 	out/gcc.oci.tgz
-	docker build -t ocirep/bash --output type=oci,dest=$@ packages/bash
+	docker build -t imgrep/bash --output type=oci,dest=$@ packages/bash
 
 out/openssl.oci.tgz: \
 	out/gcc.oci.tgz \
 	out/binutils.oci.tgz \
 	out/busybox.oci.tgz \
 	out/musl.oci.tgz
-	docker build -t ocirep/openssl --output type=oci,dest=$@ packages/openssl
+	docker build -t imgrep/openssl --output type=oci,dest=$@ packages/openssl
 
 out/go.oci.tgz: \
 	out/gcc.oci.tgz \
@@ -46,14 +46,14 @@ out/go.oci.tgz: \
 	out/busybox.oci.tgz \
 	out/bash.oci.tgz \
 	out/musl.oci.tgz
-	docker build -t ocirep/go --output type=oci,dest=$@ packages/go
+	docker build -t imgrep/go --output type=oci,dest=$@ packages/go
 
 out/perl.oci.tgz: \
 	out/gcc.oci.tgz \
 	out/binutils.oci.tgz \
 	out/busybox.oci.tgz \
 	out/musl.oci.tgz
-	docker build -t ocirep/perl --output type=oci,dest=$@ packages/perl
+	docker build -t imgrep/perl --output type=oci,dest=$@ packages/perl
 
 out/python.oci.tgz: \
 	out/gcc.oci.tgz \
@@ -63,16 +63,16 @@ out/python.oci.tgz: \
 	out/openssl.oci.tgz \
 	out/make.oci.tgz \
 	out/musl.oci.tgz
-	docker build -t ocirep/python --output type=oci,dest=$@ packages/python
+	docker build -t imgrep/python --output type=oci,dest=$@ packages/python
 
 test:
-	docker build -t ocirep/test-c tests/c
-	docker build -t ocirep/test-go tests/go
-	docker build -t ocirep/test-perl tests/perl
+	docker build -t imgrep/test-c tests/c
+	docker build -t imgrep/test-go tests/go
+	docker build -t imgrep/test-perl tests/perl
 	@printf "\nOcirep Test Suite\n"
 	@printf "go -> "
-	@docker run -i ocirep/test-go | grep Success
+	@docker run -i imgrep/test-go | grep Success
 	@printf "c -> "
-	@docker run -i ocirep/test-c | grep Success
+	@docker run -i imgrep/test-c | grep Success
 	@printf "perl -> "
-	@docker run -i ocirep/test-perl | grep Success
+	@docker run -i imgrep/test-perl | grep Success
diff --git a/packages/binutils/Dockerfile b/packages/binutils/Dockerfile
index 60f191e..6ae64f6 100644
--- a/packages/binutils/Dockerfile
+++ b/packages/binutils/Dockerfile
@@ -1,5 +1,5 @@
-FROM ocirep/musl:latest as musl
-FROM ocirep/bootstrap:latest as build
+FROM imgrep/musl:latest as musl
+FROM imgrep/bootstrap:latest as build
 
 ENV SRC_SITE https://ftp.gnu.org/gnu/binutils
 ENV SRC_VERSION 2.41
diff --git a/packages/busybox/Dockerfile b/packages/busybox/Dockerfile
index b329b5b..88c0213 100644
--- a/packages/busybox/Dockerfile
+++ b/packages/busybox/Dockerfile
@@ -1,4 +1,4 @@
-FROM ocirep/bootstrap as bootstrap
+FROM imgrep/bootstrap as bootstrap
 
 FROM bootstrap as build
 ENV SOURCE_SITE=https://busybox.net/downloads
diff --git a/packages/gcc/Dockerfile b/packages/gcc/Dockerfile
index a448af5..27acba9 100644
--- a/packages/gcc/Dockerfile
+++ b/packages/gcc/Dockerfile
@@ -1,5 +1,5 @@
-FROM ocirep/musl:latest as musl
-FROM ocirep/bootstrap:latest as build
+FROM imgrep/musl:latest as musl
+FROM imgrep/bootstrap:latest as build
 
 ENV GCC_SITE https://mirrors.kernel.org/gnu/gcc
 ENV GCC_VERSION 13.2.0
diff --git a/packages/go/Dockerfile b/packages/go/Dockerfile
index e9e67c4..cf1dc6f 100644
--- a/packages/go/Dockerfile
+++ b/packages/go/Dockerfile
@@ -1,8 +1,11 @@
-FROM ocirep/busybox:latest as busybox
-FROM ocirep/bash:latest as bash
-FROM ocirep/gcc:latest as gcc
-FROM ocirep/binutils:latest as binutils
-FROM ocirep/musl:latest as musl
+ARG REGISTRY = imgrep/
+ARG BUSYBOX_VERSION = latest
+FROM ${REGISTRY}busybox:${BUSYBOX_VERSION} as busybox
+
+FROM imgrep/bash:latest as bash
+FROM imgrep/gcc:latest as gcc
+FROM imgrep/binutils:latest as binutils
+FROM imgrep/musl:latest as musl
 
 FROM busybox as stage1
 COPY --from=bash . /bin/
diff --git a/packages/linux-headers/Dockerfile b/packages/linux-headers/Dockerfile
index 93fb6f8..8017e39 100644
--- a/packages/linux-headers/Dockerfile
+++ b/packages/linux-headers/Dockerfile
@@ -1,5 +1,5 @@
-FROM ocirep/musl:latest as musl
-FROM ocirep/bootstrap:latest as build
+FROM imgrep/musl:latest as musl
+FROM imgrep/bootstrap:latest as build
 
 ENV SRC_SITE https://mirrors.edge.kernel.org/pub/linux/kernel/v6.x/
 ENV SRC_VERSION 6.6
diff --git a/packages/make/Dockerfile b/packages/make/Dockerfile
index fa1b117..450e8df 100644
--- a/packages/make/Dockerfile
+++ b/packages/make/Dockerfile
@@ -1,5 +1,5 @@
-FROM ocirep/musl:latest as musl
-FROM ocirep/bootstrap:latest as build
+FROM imgrep/musl:latest as musl
+FROM imgrep/bootstrap:latest as build
 
 ENV SRC_SITE https://ftp.gnu.org/gnu/make
 ENV SRC_VERSION 4.4
diff --git a/packages/musl/Dockerfile b/packages/musl/Dockerfile
index 18ebbb3..27671a4 100644
--- a/packages/musl/Dockerfile
+++ b/packages/musl/Dockerfile
@@ -1,4 +1,4 @@
-FROM ocirep/bootstrap:latest as build
+FROM imgrep/bootstrap:latest as build
 
 ENV SRC_SITE http://musl.libc.org
 ENV SRC_VERSION 1.2.4
diff --git a/packages/openssl/Dockerfile b/packages/openssl/Dockerfile
index 422f21c..bfbbb3a 100644
--- a/packages/openssl/Dockerfile
+++ b/packages/openssl/Dockerfile
@@ -1,10 +1,10 @@
-FROM ocirep/busybox:latest as busybox
-FROM ocirep/gcc:latest as gcc
-FROM ocirep/binutils:latest as binutils
-FROM ocirep/musl:latest as musl
-FROM ocirep/make:latest as make
-FROM ocirep/perl:latest as perl
-FROM ocirep/linux-headers:latest as linux-headers
+FROM imgrep/busybox:latest as busybox
+FROM imgrep/gcc:latest as gcc
+FROM imgrep/binutils:latest as binutils
+FROM imgrep/musl:latest as musl
+FROM imgrep/make:latest as make
+FROM imgrep/perl:latest as perl
+FROM imgrep/linux-headers:latest as linux-headers
 
 FROM busybox as build
 COPY --from=gcc . /
@@ -21,15 +21,14 @@ RUN echo "${SRC_HASH}  openssl-${SRC_VERSION}.tar.gz" | sha256sum -c
 RUN tar -xf openssl-${SRC_VERSION}.tar.gz
 WORKDIR openssl-${SRC_VERSION}
 RUN set -eux; \
-    export CC='gcc -fPIE -pie -static'; \
+    export CC='gcc -fPIE -pie'; \
     perl ./Configure \
         --prefix=/usr \
         --libdir=lib \
         --openssldir=/etc/ssl \
-        --static \
-        -static \
+        threads \
         enable-ktls \
-        no-shared \
+        shared \
 		no-zlib \
 		no-async \
 		no-comp \
diff --git a/packages/perl/Dockerfile b/packages/perl/Dockerfile
index 4ecf7f3..60d128e 100644
--- a/packages/perl/Dockerfile
+++ b/packages/perl/Dockerfile
@@ -1,8 +1,8 @@
-FROM ocirep/busybox:latest as busybox
-FROM ocirep/gcc:latest as gcc
-FROM ocirep/binutils:latest as binutils
-FROM ocirep/musl:latest as musl
-FROM ocirep/make:latest as make
+FROM imgrep/busybox:latest as busybox
+FROM imgrep/gcc:latest as gcc
+FROM imgrep/binutils:latest as binutils
+FROM imgrep/musl:latest as musl
+FROM imgrep/make:latest as make
 
 FROM busybox as build
 ENV SRC_SITE=https://www.cpan.org/src/5.0
diff --git a/tests/rust_pcsc_static/Cargo.lock b/tests/rust/Cargo.lock
similarity index 100%
rename from tests/rust_pcsc_static/Cargo.lock
rename to tests/rust/Cargo.lock
diff --git a/tests/rust_pcsc_static/Cargo.toml b/tests/rust/Cargo.toml
similarity index 100%
rename from tests/rust_pcsc_static/Cargo.toml
rename to tests/rust/Cargo.toml
diff --git a/tests/rust_pcsc_static/Dockerfile b/tests/rust/Dockerfile
similarity index 100%
rename from tests/rust_pcsc_static/Dockerfile
rename to tests/rust/Dockerfile
diff --git a/tests/rust_pcsc_static/main.rs b/tests/rust/main.rs
similarity index 100%
rename from tests/rust_pcsc_static/main.rs
rename to tests/rust/main.rs