diff --git a/Dockerfile b/Dockerfile
index be89a8e..ce3bc16 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # This image is the base image for all OpenShift v3 language container images.
-FROM registry.fedoraproject.org/f30/s2i-core:latest
+FROM registry.fedoraproject.org/f33/s2i-core:latest
 
 ENV SUMMARY="Base image with essential libraries and tools used as a base for \
 builder images like perl, python, ruby, etc." \
@@ -30,6 +30,7 @@ RUN INSTALL_PKGS="autoconf \
   gdb \
   git \
   libcurl-devel \
+  libpq-devel \
   libxml2-devel \
   libxslt-devel \
   lsof \
@@ -38,7 +39,6 @@ RUN INSTALL_PKGS="autoconf \
   npm \
   openssl-devel \
   patch \
-  postgresql-devel \
   procps-ng \
   sqlite-devel \
   unzip \
diff --git a/README.md b/README.md
index 13e4efe..c6ace01 100644
--- a/README.md
+++ b/README.md
@@ -47,22 +47,23 @@ Two examples:
 * If you specify `BASH_ENV`, then all your `#!/bin/bash` scripts
 do not need to call `scl enable`.
 * If you specify `PROMPT_COMMAND`, then on execution of the
-`docker exec ... /bin/bash` command, the collection will be automatically enabled.
+`podman exec ... /bin/bash` command, the collection will be automatically enabled.
 
 *Note*:
 Executables in Software Collections packages (e.g., `ruby`)
 are not directly in a directory named in the `PATH` environment variable.
 This means that you cannot do:
 
-    $ docker exec <cid> ... ruby
+    $ podman exec <cid> ... ruby
 
 but must instead do:
 
-    $ docker exec <cid> ... /bin/bash -c ruby
+    $ podman exec <cid> ... /bin/bash -c ruby
 
 The `/bin/bash -c`, along with the setting the appropriate environment variable,
 ensures the correct `ruby` executable is found and invoked.
 
+Note: while the examples in this README are calling `podman`, you can replace any such calls by `docker` with the same arguments
 
 Usage
 ------------------------
@@ -82,7 +83,7 @@ $ make build VERSIONS=base TARGET=rhel7
 This image is available on DockerHub. To download it run:
 
 ```console
-docker pull sclorg/s2i-base-centos7
+podman pull quay.io/centos7/s2i-base-centos7
 ```
 
 To build a Base image from scratch run:
@@ -101,4 +102,5 @@ See also
 --------
 Dockerfile and other sources are available on https://github.com/sclorg/s2i-base-container.
 In that repository you also can find another variants of S2I base Dockerfiles.
-Dockerfile for CentOS is called Dockerfile, Dockerfile for RHEL is called Dockerfile.rhel7.
+The Dockerfile for CentOS is called Dockerfile, the Dockerfile for RHEL7 is called Dockerfile.rhel7,
+the Dockerfile for RHEL8 is called Dockerfile.rhel8 and the Dockerfile for Fedora is Dockerfile.fedora.
diff --git a/bot-cfg.yml b/bot-cfg.yml
new file mode 100644
index 0000000..d40b2ac
--- /dev/null
+++ b/bot-cfg.yml
@@ -0,0 +1,27 @@
+version: "1"
+
+betka:
+   # is betka enabled for this repository
+   # optional - defaults to false
+   enabled: true
+
+   # optional
+   notifications:
+     email_addresses: [phracek@redhat.com]
+ 
+   # Specify if master branch in upstream repository is synced
+   master_checker: true
+   # Should pull requests be synced?
+   # optional
+   pr_checker: false
+   # Either 'upstream_branch_name' or 'upstream_git_path' has to be specified
+   # Branch name which is used for sync
+   upstream_branch_name: master
+   # Path to directory with dockerfile withing upstream repository
+   upstream_git_path: "base"
+   # Github comment message to enforce sync of a pull request
+   # required if pr_checker is true otherwise optional
+   pr_comment_message: "[test]"
+   # optional
+   image_url: quay.io/rhscl/cwt-generator
+
diff --git a/test/run b/test/run
index a745d6d..ba51036 100755
--- a/test/run
+++ b/test/run
@@ -6,7 +6,7 @@
 # IMAGE_NAME specifies a name of the candidate image used for testing.
 # The image has to be available before this script is executed.
 #
-IMAGE_NAME=${IMAGE_NAME-centos/s2i-base-centos7-candidate}
+test -n "${IMAGE_NAME-}" || { echo 'make sure $IMAGE_NAME is defined'; exit 1; }
 
 test_docker_run_usage() {
 	echo "Testing 'docker run' usage..."