diff --git a/.drone.yml b/.drone.yml
index dd07e1d..ca4916c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -13,7 +13,7 @@ workspace:
 steps:
 - name: build_electron-ozone
   pull: if-not-exists
-  image: leophys/pikaur-root:0.1
+  image: leophys/pikaur:0.1
   commands:
   - /usr/bin/pikaur -Sy --noconfirm electron-ozone
   volumes:
@@ -80,7 +80,7 @@ workspace:
 steps:
 - name: build_electron-ozone
   pull: if-not-exists
-  image: leophys/pikaur-root:0.1
+  image: leophys/pikaur:0.1
   commands:
   - /usr/bin/pikaur -Sy --noconfirm discord_arch_electron
   volumes:
@@ -168,6 +168,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: 084acd02238136a8d843483c4c458d0d43d55e4b97327983930c5e9be8c276b0
+hmac: f6ed83287f957c332c27c5095dcd458ae29e216f5b142792cd459c18832abcb7
 
 ...
diff --git a/Dockerfile b/Dockerfile
index 9123394..2e24415 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,11 @@
 FROM archlinux:latest
 
 ARG uid=1000
-ARG gid=1000
+ARG gid=33
 
-RUN groupadd -g ${gid} doer \
-    && useradd -u ${uid} -g doer -m -d /doer doer \
+RUN CHECK_GROUP=$(cat /etc/group|awk -F: '{print $3}'|egrep "^${gid}$"|wc -l) \
+    && if [ $CHECK_GROUP -eq 0 ]; then groupadd -g ${gid} doer; fi \
+    && useradd -u ${uid} -g ${gid} -m -d /doer doer \
     && pacman -Sy --noconfirm \
         base-devel \
         glibc \
diff --git a/Dockerfile.root b/Dockerfile.root
deleted file mode 100644
index 4b4d553..0000000
--- a/Dockerfile.root
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM archlinux:latest
-
-RUN pacman -Sy --noconfirm \
-        base-devel \
-        glibc \
-        git \
-        sudo \
-        python-commonmark \
-        pyalpm \
- && mkdir /build
-
-VOLUME ["/var/lib/pacman", "/var/cache/pacman"]
-WORKDIR /build
-
-RUN git clone https://aur.archlinux.org/pikaur.git \
- && cd pikaur \
- && makepkg -fsri --noconfirm
-
-ENTRYPOINT ["/usr/bin/pikaur"]
-CMD []