diff --git a/.github/workflows/docker-buildimage-daedalos.yml b/.github/workflows/docker-buildimage-daedalos.yml
index b17ac142..97bc8d5c 100644
--- a/.github/workflows/docker-buildimage-daedalos.yml
+++ b/.github/workflows/docker-buildimage-daedalos.yml
@@ -35,7 +35,7 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USER }}
           password: ${{ secrets.DOCKERHUB_PASSWD }}
-      - name: Login to DockerHub
+      - name: Login to Github Container Registry
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
diff --git a/.github/workflows/docker-buildimage-dell-openmanage.yml b/.github/workflows/docker-buildimage-dell-openmanage.yml
index 788848f1..732a759a 100644
--- a/.github/workflows/docker-buildimage-dell-openmanage.yml
+++ b/.github/workflows/docker-buildimage-dell-openmanage.yml
@@ -22,6 +22,12 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USER }}
           password: ${{ secrets.DOCKERHUB_PASSWD }}
+      - name: Login to Github Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
       - name: Build and push
         uses: docker/build-push-action@v5
         with:
@@ -29,6 +35,8 @@ jobs:
           file: docker/dell-openmanage/Dockerfile
           platforms: linux/amd64
           push: true
-          tags: |
-            docker.io/gsmlg/dell-openmanage:v9.5.0
-            docker.io/gsmlg/dell-openmanage:latest
+          tags:
+            - docker.io/gsmlg/dell-openmanage:v9.5.0
+            - docker.io/gsmlg/dell-openmanage:latest
+            - ghcr.io/gsmlg-dev/dell-openmanage:v9.5.0
+            - ghcr.io/gsmlg-dev/dell-openmanage:latest
diff --git a/.github/workflows/docker-buildimage-dell-poweredge.yml b/.github/workflows/docker-buildimage-dell-poweredge.yml
deleted file mode 100644
index 0634c934..00000000
--- a/.github/workflows/docker-buildimage-dell-poweredge.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: docker-buildimage-dell-poweredge
-
-on:
-  push:
-    branches: [ main ]
-    paths:
-      - "docker/dell-poweredge/**"
-      - ".github/workflows/docker-buildimage-dell-poweredge.yml"
-
-jobs:
-  build-image:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USER }}
-          password: ${{ secrets.DOCKERHUB_PASSWD }}
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          context: docker/dell-poweredge/
-          file: docker/dell-poweredge/Dockerfile
-          platforms: linux/amd64
-          push: true
-          tags: |
-            docker.io/gsmlg/dell-poweredge:v9.5.0
-            docker.io/gsmlg/dell-poweredge:latest
diff --git a/docker/dell-openmanage/Dockerfile b/docker/dell-openmanage/Dockerfile
index 81ad55b8..96bf9b71 100644
--- a/docker/dell-openmanage/Dockerfile
+++ b/docker/dell-openmanage/Dockerfile
@@ -4,6 +4,7 @@ FROM centos:7.6.1810
 LABEL maintainer="Jonathan Gao <gsmlg.com@gmail.com>"
 #MAINTAINER Steve Kamerman "https://github.com/kamermans"
 #MAINTAINER Jose De la Rosa "https://github.com/jose-delarosa"
+LABEL org.opencontainers.image.source https://github.com/gsmlg-dev/Foundation/tree/main/docker/dell-openmanage
 
 # Environment variables
 ENV PATH $PATH:/opt/dell/srvadmin/bin:/opt/dell/srvadmin/sbin
diff --git a/docker/dell-poweredge/Dockerfile b/docker/dell-poweredge/Dockerfile
deleted file mode 100644
index 00f6b73a..00000000
--- a/docker/dell-poweredge/Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM ubuntu:20.04
-
-ENV container docker
-ENV LC_ALL C
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt update && apt install -y gnupg \
-  && sed -i 's/# deb/deb/g' /etc/apt/sources.list \
-  && apt-get install -y systemd systemd-sysv kmod \
-  && cd /lib/systemd/system/sysinit.target.wants/ \
-  && ls | grep -v systemd-tmpfiles-setup | xargs rm -f $1 \
-  && rm -f /lib/systemd/system/multi-user.target.wants/* \
-  /etc/systemd/system/*.wants/* \
-  /lib/systemd/system/local-fs.target.wants/* \
-  /lib/systemd/system/sockets.target.wants/*udev* \
-  /lib/systemd/system/sockets.target.wants/*initctl* \
-  /lib/systemd/system/basic.target.wants/* \
-  /lib/systemd/system/anaconda.target.wants/* \
-  /lib/systemd/system/plymouth* \
-  /lib/systemd/system/systemd-update-utmp* \
-  && echo 'deb http://linux.dell.com/repo/community/openmanage/950/focal focal main' | \
-  tee -a /etc/apt/sources.list.d/linux.dell.com.sources.list \
-  && gpg --keyserver pool.sks-keyservers.net --recv-key 1285491434D8786F \
-  && gpg -a --export 1285491434D8786F | apt-key add - \
-  && apt update && apt install -y srvadmin-all \
-  && apt-get clean \
-  && rm -rf /tmp/* /var/cache/* /var/lib/apt/lists/*
diff --git a/docker/dell-poweredge/README.md b/docker/dell-poweredge/README.md
deleted file mode 100644
index e69de29b..00000000