diff --git a/atomic.spec b/atomic.spec
index 4af2280..4cc2b85 100644
--- a/atomic.spec
+++ b/atomic.spec
@@ -46,7 +46,7 @@ BuildRequires: go-srpm-macros
 BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
 BuildRequires: %{pypkg}-dateutil
 BuildRequires: %{pypkg}-dbus
-%if 0%{?fedora} > 25
+%if 0%{?fedora} >= 26
 BuildRequires: %{pypkg}-docker
 %else
 BuildRequires: %{pypkg}-docker-py
@@ -80,7 +80,7 @@ Requires: rpm-%{pypkg}
 # https://github.com/projectatomic/atomic/pull/180
 Requires: %{pypkg}-dateutil
 Requires: %{pypkg}-dbus
-%if 0%{?fedora} > 25
+%if 0%{?fedora} >= 26
 Requires: %{pypkg}-docker >= 1.7.2
 %else
 Requires: %{pypkg}-docker-py
@@ -134,18 +134,15 @@ cd ..
 tar zxf %{SOURCE1}
 
 %build
-cd ..
-pushd registries-%{commit_atomic_registries}
+pushd ../registries-%{commit_atomic_registries}
 sh ./autogen.sh
 %configure
 %make_build
 popd
-pushd atomic-%{commit}
 if [ %{pypkg} == 'python3' ]; then
     sed -i 's/input = raw_input/pass/' Atomic/util.py
 fi
 make PYTHON=%{__python} PYLINT=true all
-popd
 
 %install
 make PYTHON=%{__python}  install-only DESTDIR=%{buildroot}
@@ -182,8 +179,7 @@ EOF
   '%{_datadir}/polkit-1/actions/org.%{name}.policy' \
   '%{_mandir}/man1/%{name}*'
 
-cd ..
-pushd registries-%{commit_atomic_registries}
+pushd ../registries-%{commit_atomic_registries}
 %make_install
 install -d %{buildroot}%{_sysconfdir}/containers/
 %if 0%{?rhel}
@@ -193,7 +189,6 @@ install -p -m 644 registries.fedora %{buildroot}%{_sysconfdir}/containers/regist
 %else
 install -p -m 644 registries.conf %{buildroot}%{_sysconfdir}/containers/
 %endif
-
 install -d %{buildroot}%{_unitdir}
 install -p -m 644  registries.service %{buildroot}%{_unitdir}
 popd
@@ -201,9 +196,9 @@ popd
 
 %check
 [ ! -w /run/docker.sock ] || make PYTHON=%{__python} test
-cd ..
-pushd registries-%{commit_atomic_registries}
+pushd ../registries-%{commit_atomic_registries}
 make check
+popd
 
 
 #define license tag if not already defined