diff --git a/Makefile b/Makefile
index 1cd68f7..b08ef4c 100644
--- a/Makefile
+++ b/Makefile
@@ -25,8 +25,4 @@ install:
 	install -m 0755 builder $(DESTDIR)/$(USBINDIR)/
 
 	install -d $(DESTDIR)/$(UBINDIR)
-	install -m 0755 sabayon-buildpackages $(DESTDIR)/$(UBINDIR)/
-	install -m 0755 sabayon-createrepo $(DESTDIR)/$(UBINDIR)/
-	install -m 0755 sabayon-entropypreservedlibs $(DESTDIR)/$(UBINDIR)/
-	install -m 0755 sabayon-brokenlibs $(DESTDIR)/$(UBINDIR)/
-	install -m 0755 sabayon-bz2brokenlibs $(DESTDIR)/$(UBINDIR)/
+	install -m 0755 sabayon-* $(DESTDIR)/$(UBINDIR)/
diff --git a/sabayon-createrepo b/sabayon-createrepo
index 3bb0515..e3eaf4d 100755
--- a/sabayon-createrepo
+++ b/sabayon-createrepo
@@ -88,6 +88,13 @@ default-repository = $REPOSITORY_NAME
 repository=$REPOSITORY_NAME|$REPOSITORY_DESCRIPTION|file:///sabayon/artifacts
 EOF
 
+function cleanup {
+  rm -rf $createrepo
+  rm -rf $entropysrv
+}
+
+trap cleanup EXIT
+
 echo "docker run --rm --entrypoint /bin/bash ${docker_env[@]} ${docker_volumes[@]} -ti $DOCKER_IMAGE /sabayon/bin/create_repo.sh"
 
 docker run --rm --entrypoint /bin/bash "${docker_env[@]}" "${docker_volumes[@]}" -ti $DOCKER_IMAGE /sabayon/bin/create_repo.sh || true
diff --git a/sabayon-createrepo-cleanup b/sabayon-createrepo-cleanup
new file mode 100755
index 0000000..5de43ef
--- /dev/null
+++ b/sabayon-createrepo-cleanup
@@ -0,0 +1,93 @@
+#!/bin/bash
+set -e
+. /sbin/sabayondevkit-functions.sh
+
+SAB_WORKSPACE="${SAB_WORKSPACE:-$PWD}"
+entropysrv=$(mktemp)
+createrepo=$(mktemp)
+REPOSITORY_NAME="${REPOSITORY_NAME:-default}"
+REPOSITORY_DESCRIPTION="${REPOSITORY_DESCRIPTION:-My Sabayon repository}"
+DOCKER_IMAGE="${DOCKER_IMAGE:-sabayon/eit-amd64}"
+PORTAGE_ARTIFACTS="${PORTAGE_ARTIFACTS:-$SAB_WORKSPACE/portage_artifacts}"
+OUTPUT_DIR="${OUTPUT_DIR:-$SAB_WORKSPACE/entropy_artifacts}"
+
+args=("$@")
+EDITOR=cat
+
+docker_env=(-e "EDITOR=$EDITOR"
+            -e "REPOSITORY=$REPOSITORY_NAME"
+            -e "LC_ALL=en_US.UTF-8")
+
+docker_volumes=(
+            -v "$OUTPUT_DIR:/sabayon/artifacts"
+            -v "$createrepo:/sabayon/bin/create_repo.sh"
+            -v "$entropysrv:/etc/entropy/server.conf"
+            -v "$PORTAGE_ARTIFACTS:/usr/portage/packages" )
+
+
+check_docker_requirements
+
+echo "Repository: $REPOSITORY_NAME"
+echo "Repository Description: $REPOSITORY_DESCRIPTION"
+echo "Remove: ${args[@]}"
+
+# Creating the building script on-the-fly
+cat >$createrepo <<EOF
+#!/bin/bash
+set -e
+repo="\${REPOSITORY:-default}"
+
+if [ -d "/sabayon/artifacts/standard" ]; then
+  eit unlock \$repo || true
+  eit pull --quick $repo || true
+  #eit sync \$repo
+else
+  echo "ouch no repository there" && exit 3;
+fi
+
+eit clean --quick || { echo "ouch unable to remove" && exit 3; }
+eit vacuum --quick || { echo "ouch unable to remove" && exit 3; }
+
+echo "Yes Yes Yes" | eit commit --quick
+eit push --quick --force
+
+EOF
+chmod +x $createrepo
+
+# Creating the entropy repository configuration on-the-fly
+cat >$entropysrv <<EOF
+# expiration-days = <internal value>
+community-mode = enable
+weak-package-files = disable
+database-format = bz2
+# sync-speed-limit =
+# server-basic-languages = en_US C
+# disabled-eapis = 1,2
+# expiration-based-scope = disable
+# nonfree-packages-directory-support = disable
+rss-feed = disable
+changelog = disable
+rss-name = packages.rss
+rss-base-url = http://packages.sabayon.org/?quicksearch=
+rss-website-url = http://www.sabayon.org/
+max-rss-entries = 10000
+# max-rss-light-entries = 100
+rss-light-name = updates.rss
+managing-editor =
+broken-reverse-deps = disable
+default-repository = $REPOSITORY_NAME
+repository=$REPOSITORY_NAME|$REPOSITORY_DESCRIPTION|file:///sabayon/artifacts
+EOF
+
+
+function cleanup {
+  rm -rf $createrepo
+  rm -rf $entropysrv
+}
+
+trap cleanup EXIT
+
+
+echo "docker run --rm --entrypoint /bin/bash ${docker_env[@]} ${docker_volumes[@]} -ti $DOCKER_IMAGE /sabayon/bin/create_repo.sh"
+
+docker run --rm --entrypoint /bin/bash "${docker_env[@]}" "${docker_volumes[@]}" -ti $DOCKER_IMAGE /sabayon/bin/create_repo.sh || true
diff --git a/sabayon-createrepo-remove b/sabayon-createrepo-remove
new file mode 100755
index 0000000..93c6d2f
--- /dev/null
+++ b/sabayon-createrepo-remove
@@ -0,0 +1,91 @@
+#!/bin/bash
+set -e
+. /sbin/sabayondevkit-functions.sh
+
+SAB_WORKSPACE="${SAB_WORKSPACE:-$PWD}"
+entropysrv=$(mktemp)
+createrepo=$(mktemp)
+REPOSITORY_NAME="${REPOSITORY_NAME:-default}"
+REPOSITORY_DESCRIPTION="${REPOSITORY_DESCRIPTION:-My Sabayon repository}"
+DOCKER_IMAGE="${DOCKER_IMAGE:-sabayon/eit-amd64}"
+PORTAGE_ARTIFACTS="${PORTAGE_ARTIFACTS:-$SAB_WORKSPACE/portage_artifacts}"
+OUTPUT_DIR="${OUTPUT_DIR:-$SAB_WORKSPACE/entropy_artifacts}"
+
+args=("$@")
+EDITOR=cat
+
+docker_env=(-e "EDITOR=$EDITOR"
+            -e "REPOSITORY=$REPOSITORY_NAME"
+            -e "LC_ALL=en_US.UTF-8")
+
+docker_volumes=(
+            -v "$OUTPUT_DIR:/sabayon/artifacts"
+            -v "$createrepo:/sabayon/bin/create_repo.sh"
+            -v "$entropysrv:/etc/entropy/server.conf"
+            -v "$PORTAGE_ARTIFACTS:/usr/portage/packages" )
+
+
+check_docker_requirements
+
+echo "Repository: $REPOSITORY_NAME"
+echo "Repository Description: $REPOSITORY_DESCRIPTION"
+echo "Remove: ${args[@]}"
+
+# Creating the building script on-the-fly
+cat >$createrepo <<EOF
+#!/bin/bash
+set -e
+repo="\${REPOSITORY:-default}"
+
+if [ -d "/sabayon/artifacts/standard" ]; then
+  eit unlock \$repo || true
+  eit pull --quick $repo || true
+  #eit sync \$repo
+else
+  echo "ouch no repository there" && exit 3;
+fi
+
+echo "Yes" | eit rm --from \$repo ${args[@]} || { echo "ouch unable to remove" && exit 3; }
+echo "Yes Yes Yes" | eit commit --quick
+eit push --quick --force
+
+EOF
+chmod +x $createrepo
+
+# Creating the entropy repository configuration on-the-fly
+cat >$entropysrv <<EOF
+# expiration-days = <internal value>
+community-mode = enable
+weak-package-files = disable
+database-format = bz2
+# sync-speed-limit =
+# server-basic-languages = en_US C
+# disabled-eapis = 1,2
+# expiration-based-scope = disable
+# nonfree-packages-directory-support = disable
+rss-feed = disable
+changelog = disable
+rss-name = packages.rss
+rss-base-url = http://packages.sabayon.org/?quicksearch=
+rss-website-url = http://www.sabayon.org/
+max-rss-entries = 10000
+# max-rss-light-entries = 100
+rss-light-name = updates.rss
+managing-editor =
+broken-reverse-deps = disable
+default-repository = $REPOSITORY_NAME
+repository=$REPOSITORY_NAME|$REPOSITORY_DESCRIPTION|file:///sabayon/artifacts
+EOF
+
+
+function cleanup {
+  rm -rf $createrepo
+  rm -rf $entropysrv
+}
+
+trap cleanup EXIT
+
+
+echo "docker run --rm --entrypoint /bin/bash ${docker_env[@]} ${docker_volumes[@]} -ti $DOCKER_IMAGE /sabayon/bin/create_repo.sh"
+
+docker run --rm --entrypoint /bin/bash "${docker_env[@]}" "${docker_volumes[@]}" -ti $DOCKER_IMAGE /sabayon/bin/create_repo.sh || true