diff --git a/Dockerfile b/Dockerfile
index 5b1d5ce..ec3e45a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,10 @@
-FROM registry.fedoraproject.org/fedora:26
+FROM registry.fedoraproject.org/fedora:rawhide
 LABEL maintainer "Tomas Tomecek \"ttomecek@redhat.com\""
 
-ENV NAME=tools VERSION=0 RELEASE=2 ARCH=x86_64
+ENV NAME=tools VERSION=0 ARCH=x86_64
 LABEL com.redhat.component="$NAME" \
       name="$FGC/$NAME" \
       version="$VERSION" \
-      release="$RELEASE.$DISTTAG" \
       architecture="$ARCH" \
       run="docker run -it --name NAME --privileged --ipc=host --net=host --pid=host -e HOST=/host -e NAME=NAME -e IMAGE=IMAGE -v /run:/run -v /var/log:/var/log -v /etc/machine-id:/etc/machine-id -v /etc/localtime:/etc/localtime -v /:/host IMAGE" \
       summary="container with all the management tools you miss in Atomic Host"
@@ -43,6 +42,7 @@ RUN dnf remove -y vim-minimal && dnf install -y \
   perf \
   procps-ng \
   psmisc \
+  rpm-build \
   screen \
   sos \
   strace \
diff --git a/root/README.md b/root/README.md
index fe8e338..b7dc1d1 100644
--- a/root/README.md
+++ b/root/README.md
@@ -3,7 +3,7 @@
 % September 11th, 2017
 
 # NAME
-tools - container with all the management tools you miss in Atomic Host 
+tools - container with all the management tools you miss in Atomic Host
 
 
 # DESCRIPTION
@@ -11,7 +11,6 @@ You find plenty of well-known tools within this container. Here comes the full l
 
 | Package         | Summary                                                                                     | Executables                        |
 | --------------- | ------------------------------------------------------------------------------------------- | ---------------------------------- |
-| bash-completion | Programmable completion for Bash                                                            |                                    |
 | bc              | GNU's bc (a numeric processing language) and dc (a calculator)                              | /usr/bin/bc                        |
 |                 |                                                                                             | /usr/bin/dc                        |
 | bind-utils      | Utilities for querying DNS name servers                                                     | /usr/bin/arpaname                  |
@@ -76,7 +75,7 @@ You find plenty of well-known tools within this container. Here comes the full l
 |                 |                                                                                             | /usr/sbin/tune2fs                  |
 | ethtool         | Settings tool for Ethernet NICs                                                             | /usr/sbin/ethtool                  |
 | file            | A utility for determining file types                                                        | /usr/bin/file                      |
-| gcc             | Various compilers (C, C++, Objective-C, Java, ...)                                          | /usr/bin/c89                       |
+| gcc             | Various compilers (C, C++, Objective-C, ...)                                                | /usr/bin/c89                       |
 |                 |                                                                                             | /usr/bin/c99                       |
 |                 |                                                                                             | /usr/bin/cc                        |
 |                 |                                                                                             | /usr/bin/gcc                       |
@@ -130,6 +129,7 @@ You find plenty of well-known tools within this container. Here comes the full l
 |                 |                                                                                             | /usr/sbin/ip                       |
 |                 |                                                                                             | /usr/sbin/lnstat                   |
 |                 |                                                                                             | /usr/sbin/nstat                    |
+|                 |                                                                                             | /usr/sbin/rdma                     |
 |                 |                                                                                             | /usr/sbin/routef                   |
 |                 |                                                                                             | /usr/sbin/routel                   |
 |                 |                                                                                             | /usr/sbin/rtacct                   |
@@ -183,8 +183,6 @@ You find plenty of well-known tools within this container. Here comes the full l
 |                 |                                                                                             | /usr/bin/numactl                   |
 |                 |                                                                                             | /usr/bin/numademo                  |
 |                 |                                                                                             | /usr/bin/numastat                  |
-| numactl-devel   | Development package for building Applications that use numa                                 |                                    |
-| parted          | The GNU disk partition manipulation program                                                 |                                    |
 | pciutils        | PCI bus related utilities                                                                   | /usr/sbin/update-pciids            |
 | perf            | Performance monitoring for the Linux kernel                                                 | /usr/bin/perf                      |
 | procps-ng       | System and process monitoring utilities                                                     | /usr/bin/free                      |
@@ -208,9 +206,13 @@ You find plenty of well-known tools within this container. Here comes the full l
 | psmisc          | Utilities for managing processes on your system                                             | /usr/bin/killall                   |
 |                 |                                                                                             | /usr/bin/peekfd                    |
 |                 |                                                                                             | /usr/bin/prtstat                   |
+|                 |                                                                                             | /usr/bin/pslog                     |
 |                 |                                                                                             | /usr/bin/pstree                    |
 |                 |                                                                                             | /usr/bin/pstree.x11                |
 |                 |                                                                                             | /usr/sbin/fuser                    |
+| rpm-build       | Scripts and executable programs used to build packages                                      | /usr/bin/gendiff                   |
+|                 |                                                                                             | /usr/bin/rpmbuild                  |
+|                 |                                                                                             | /usr/bin/rpmspec                   |
 | screen          | A screen manager that supports multiple logins on one terminal                              | /usr/bin/screen                    |
 | sos             | A set of tools to gather troubleshooting information from a system                          | /usr/sbin/sosreport                |
 | strace          | Tracks and displays system calls associated with a running process                          | /usr/bin/strace                    |
@@ -249,13 +251,13 @@ You find plenty of well-known tools within this container. Here comes the full l
 |                 |                                                                                             | /usr/sbin/xfs_quota                |
 |                 |                                                                                             | /usr/sbin/xfs_repair               |
 |                 |                                                                                             | /usr/sbin/xfs_rtcp                 |
-
+|                 |                                                                                             | /usr/sbin/xfs_spaceman             |
 
 # USAGE
 You should invoke this container using `atomic` command:
 
 ```
-$ atomic run f26/tools
+$ atomic run registry.fedoraproject.org/f27/tools
 ```