diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a918459910..da135b2d10 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -230,40 +230,6 @@ jobs:
       - name: Build package
         run: dpkg-buildpackage -us -uc -b
 
-  rpm-package:
-    name: ${{ matrix.container_name }} (package, non-mavsdk_server)
-    runs-on: ubuntu-20.04
-    container: mavsdk/mavsdk-${{ matrix.container_name }}
-    strategy:
-      matrix:
-        container_name: [fedora-34, fedora-35, fedora-36]
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-      - name: git permission workaround
-        run: |
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
-          git config --global --add safe.directory /github/workspace
-      - name: install dependencies
-        run: yum -y install perl-IPC-Cmd perl-Pod-Html
-      - name: configure
-        run: cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_MAVSDK_SERVER=OFF -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=install -DWERROR=OFF  -Bbuild/release -H.
-      - name: build
-        run: cmake --build build/release --target install -- -j2
-      - name: Package
-        if: startsWith(github.ref, 'refs/tags/v')
-        run: tools/create_packages.sh ./install . x86_64 mavsdk-devel
-      - name: Publish artefacts
-        if: startsWith(github.ref, 'refs/tags/v')
-        uses: svenstaro/upload-release-action@v1-release
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file_glob: true
-          file: '*.rpm'
-          tag: ${{ github.ref }}
-          overwrite: true
-
   dockcross-linux-arm:
     name: linux-${{ matrix.arch_name }}
     runs-on: ubuntu-20.04
diff --git a/docker/Dockerfile-Fedora-35 b/docker/Dockerfile-Fedora-35
deleted file mode 100644
index c1560d0733..0000000000
--- a/docker/Dockerfile-Fedora-35
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Development environment for the MAVSDK based on Fedora 35.
-#
-# Author: Julian Oes <julian@oes.ch>
-#
-
-FROM fedora:35
-
-MAINTAINER Julian Oes <julian@oes.ch>
-
-RUN dnf -y install \
-    autoconf \
-    automake \
-    ccache \
-    clang \
-    cmake \
-    colordiff \
-    doxygen \
-    gcc \
-    gcc-c++ \
-    git \
-    golang \
-    libcurl-devel \
-    libtool \
-    make \
-    ninja-build \
-    perl-FindBin \
-    python \
-    python-pip \
-    redhat-rpm-config \
-    rpm-build \
-    ruby-devel \
-    rubygems \
-    sudo \
-    tinyxml2-devel \
-    wget \
-    which \
-    zlib-devel \
-    && dnf clean all
-
-RUN gem install --no-document fpm;
-
-RUN wget -qO- https://github.com/ncopa/su-exec/archive/dddd1567b7c76365e1e0aac561287975020a8fad.tar.gz | tar xvz && \
-    cd su-exec-* && make && mv su-exec /usr/local/bin && cd .. && rm -rf su-exec-*
-
-# Create user with id 1001 (Jenkins docker workflow default)
-RUN useradd --shell /bin/bash -u 1001 -c "" -m user
-
-ADD /sudoers.txt /etc/sudoers
-RUN chmod 440 /etc/sudoers
-
-COPY entrypoint.sh /usr/local/bin/entrypoint.sh
-
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
-
-WORKDIR "/home/user/MAVSDK"
diff --git a/docker/Dockerfile-Fedora-36 b/docker/Dockerfile-Fedora-36
deleted file mode 100644
index de92c9cda0..0000000000
--- a/docker/Dockerfile-Fedora-36
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Development environment for the MAVSDK based on Fedora 36.
-#
-# Author: Julian Oes <julian@oes.ch>
-#
-
-FROM fedora:36
-
-MAINTAINER Julian Oes <julian@oes.ch>
-
-RUN dnf -y install \
-    autoconf \
-    automake \
-    ccache \
-    clang \
-    cmake \
-    colordiff \
-    doxygen \
-    gcc \
-    gcc-c++ \
-    git \
-    golang \
-    libcurl-devel \
-    libtool \
-    make \
-    ninja-build \
-    perl-FindBin \
-    python \
-    python-pip \
-    redhat-rpm-config \
-    rpm-build \
-    ruby-devel \
-    rubygems \
-    sudo \
-    tinyxml2-devel \
-    wget \
-    which \
-    zlib-devel \
-    && dnf clean all
-
-RUN gem install --no-document fpm;
-
-RUN wget -qO- https://github.com/ncopa/su-exec/archive/dddd1567b7c76365e1e0aac561287975020a8fad.tar.gz | tar xvz && \
-    cd su-exec-* && make && mv su-exec /usr/local/bin && cd .. && rm -rf su-exec-*
-
-# Create user with id 1001 (Jenkins docker workflow default)
-RUN useradd --shell /bin/bash -u 1001 -c "" -m user
-
-ADD /sudoers.txt /etc/sudoers
-RUN chmod 440 /etc/sudoers
-
-COPY entrypoint.sh /usr/local/bin/entrypoint.sh
-
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
-
-WORKDIR "/home/user/MAVSDK"
diff --git a/docker/build_and_push_docker_images.sh b/docker/build_and_push_docker_images.sh
index 93f38b62e4..5178be39d2 100755
--- a/docker/build_and_push_docker_images.sh
+++ b/docker/build_and_push_docker_images.sh
@@ -10,8 +10,6 @@ then
     DOCKER_CMD=podman
 fi
 
-$DOCKER_CMD build -f Dockerfile-Fedora-35 -t mavsdk/mavsdk-fedora-35 .
-$DOCKER_CMD build -f Dockerfile-Fedora-36 -t mavsdk/mavsdk-fedora-36 .
 $DOCKER_CMD build -f Dockerfile-Ubuntu-20.04 -t mavsdk/mavsdk-ubuntu-20.04 .
 $DOCKER_CMD build -f Dockerfile-Ubuntu-22.04 -t mavsdk/mavsdk-ubuntu-22.04 .
 $DOCKER_CMD build -f Dockerfile-Ubuntu-20.04-PX4-SITL-v1.11 -t mavsdk/mavsdk-ubuntu-20.04-px4-sitl-v1.11 .
@@ -23,8 +21,6 @@ $DOCKER_CMD build -f Dockerfile.dockcross-linux-armv6-custom -t mavsdk/mavsdk-do
 $DOCKER_CMD build -f Dockerfile.dockcross-linux-armv7-custom -t mavsdk/mavsdk-dockcross-linux-armv7-custom .
 $DOCKER_CMD build -f Dockerfile.dockcross-linux-arm64-custom -t mavsdk/mavsdk-dockcross-linux-arm64-custom .
 
-$DOCKER_CMD push mavsdk/mavsdk-fedora-35:latest
-$DOCKER_CMD push mavsdk/mavsdk-fedora-36:latest
 $DOCKER_CMD push mavsdk/mavsdk-ubuntu-20.04:latest
 $DOCKER_CMD push mavsdk/mavsdk-ubuntu-22.04:latest
 $DOCKER_CMD push mavsdk/mavsdk-ubuntu-20.04-px4-sitl-v1.11:latest