diff --git a/images/samba-dc/Dockerfile b/images/samba-dc/Dockerfile
index 89c63f81..0a6f953b 100644
--- a/images/samba-dc/Dockerfile
+++ b/images/samba-dc/Dockerfile
@@ -32,10 +32,12 @@ COPY entrypoint.sh /usr/local/bin/
 RUN echo "@edge https://dl-cdn.alpinelinux.org/alpine/edge/main" \
       >> /etc/apk/repositories && \
     apk add -u --no-cache krb5 ldb-tools samba-dc@edge=$SAMBA_VERSION \
-      samba-winbind-clients=$SAMBA_VERSION tdb bind bind-libs bind-tools \
+      ldb-tools@edge \
+      samba-winbind-clients@edge=$SAMBA_VERSION tdb bind bind-libs bind-tools \
       libcrypto3 libxml2 tzdata py3-cryptography py3-setuptools py3-pip && \
     pip install jinjanator --break-system-packages && \
-    apk del py3-pip && \
+    # TODO restore when 4.23.10+ appears in alpine main
+    # apk del py3-pip && \
     chmod 0755 /usr/local/bin/entrypoint.sh
 
 VOLUME /etc/samba /var/lib/samba
diff --git a/images/samba/Dockerfile b/images/samba/Dockerfile
index 2045728a..12a5e591 100644
--- a/images/samba/Dockerfile
+++ b/images/samba/Dockerfile
@@ -18,7 +18,8 @@ ENV LOGON_DRIVE=H \
 
 RUN echo "@edge https://dl-cdn.alpinelinux.org/alpine/edge/main" \
       >> /etc/apk/repositories && \
-    apk add -u --no-cache samba@edge=$SAMBA_VERSION shadow tzdata
+    apk add -u --no-cache samba@edge=$SAMBA_VERSION shadow tzdata \
+      libcrypto3 libssl3
 
 VOLUME /etc/samba/conf.d /var/log/samba
 EXPOSE 137-138/udp 139 445
diff --git a/images/weewx/Dockerfile b/images/weewx/Dockerfile
index abb5a306..63c31764 100644
--- a/images/weewx/Dockerfile
+++ b/images/weewx/Dockerfile
@@ -66,7 +66,7 @@ RUN apk add -u --no-cache \
     python3 -m venv $VENV --system-site-packages && \
     source $VENV/bin/activate && \
     pip install weewx==$WEEWX_VERSION ct3 && \
-    pip uninstall -y setuptools && \
+    pip uninstall -y pip && \
     git clone -b $WEEGREEN_VERSION --depth 1 \
       https://github.com/instantlinux/weewx-WeeGreen.git \
       $WX_ROOT/skins/WeeGreen && \