diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c812532130a58437f575e57a61c9db8f986346d2..c2b2b18a5138a802d082baa37de2a9537cde8bca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,45 +1,30 @@
-image: obarun/pkgbuild:latest
-
-variables:
-  repo: "$CI_PROJECT_DIR"
-  pkg_name: "$CI_PROJECT_NAME"
-  ssh_private_key: "$SSH_PRIVATE_KEY"
-  ssh_known_host: "$SSH_KNOWN_HOSTS"
-  pkg_target: "$CI_COMMIT_REF_NAME"
-  repo_conf: ".repositories.conf"
-  # followed variable are ignored but
-  # need to be set
-  pkg_track: "branch"
-  pkg_address: "$CI_PROJECT_URL"
-  
 stages:
-  - build
-  - deploy
+    - build
+    - commit
 
-build_repo:
+package:
   stage: build
   script:
-    - cp ./${repo_conf} /etc/${repo_conf}
-    - builder.sh --chdir=trunk --use-repo
-  
-  retry:
-    max: 2
+    - mkdir -p /etc/pkg
+    - cp ./pkg.cfg /etc/pkg/pkg.cfg
+    - cp ./pacman.conf.builder /etc/pacman.conf.builder
+    - pkg-prepare.sh
+    - pkg-build.sh --chdir=trunk $CI_PROJECT_DIR
 
   artifacts:
     name: $CI_PROJECT_NAME-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA
-    expire_in: 2 days
     paths:
      - "*.pkg.tar.xz"
-  
+
   only:
     changes:
       - trunk/PKGBUILD
-   
-deploy:
-  stage: deploy
+
+commit:
+  stage: commit
   only:
     changes:
       - trunk/PKGBUILD
-      
-  script:    
-    - deploy.sh    
+
+  script:
+    - pkg-commit.sh
diff --git a/.repositories.conf b/pacman.conf.builder
similarity index 70%
rename from .repositories.conf
rename to pacman.conf.builder
index fdda69964636a58b9ff2b539079944efec3050f4..24b7accd80878148d5aa5c35962c90c8e651108b 100644
--- a/.repositories.conf
+++ b/pacman.conf.builder
@@ -1,10 +1,25 @@
-[init-toolchain]
-SigLevel = Required
-Server = https://repo.obarun.org/init-toolchain
-
-[obcore-testing]
-SigLevel = Required
-Server = https://repo.obarun.org/obcore-testing
+#
+# pacman.conf used if the options --pacman-conf passed at our-build.sh on the .gitlab.yml file
+#
+
+[options]
+HoldPkg     = pacman glibc
+Architecture = auto
+IgnorePkg   = systemd
+IgnorePkg   = systemd-libs
+NoExtract   = usr/lib/libsystemd*.*
+Color
+CheckSpace
+VerbosePkgLists
+ParallelDownloads = 5
+#XferCommand =
+
+SigLevel    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+
+#[obcore-testing]
+#SigLevel = Required
+#Server = https://repo.obarun.org/obcore-testing/
 
 [obcore]
 SigLevel = Required
diff --git a/pkg.cfg b/pkg.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..dc48ddd56ec17d187417cb443b6ebaf9e661f953
--- /dev/null
+++ b/pkg.cfg
@@ -0,0 +1,2 @@
+# Options passed to makepkg
+makepkg_opts=( "--noconfirm" "--nosign" "--syncdeps" "--rmdeps" "--clean" "--cleanbuild" )