diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 `fedora-dists` uses [PVP Versioning](https://pvp.haskell.org).
 
+## 1.1.0
+- update for Fedora 31
+- haddock documentation
+- move distTag, distTarget and hackageRelease to fedora-haskell-tools
+
 ## 1.0.1
 - add mockConfig and distContainer
 - Fedora 30 branched from Rawhide
diff --git a/FedoraDists.hs b/FedoraDists.hs
--- a/FedoraDists.hs
+++ b/FedoraDists.hs
@@ -17,12 +17,10 @@
   (Dist(..),
    dists,
    distBranch,
+   distContainer,
    distRepo,
-   distTag,
-   distTarget,
    distUpdates,
    distOverride,
-   hackageRelease,
    kojicmd,
    mockConfig,
    releaseVersion,
@@ -32,7 +30,6 @@
    rpmDistTag) where
 
 import Data.Version
-import Data.Maybe (fromMaybe)
 import Text.Read
 
 #if (defined(MIN_VERSION_base) && MIN_VERSION_base(4,8,0))
@@ -69,25 +66,16 @@
 
 -- | Current maintained distribution releases.
 dists :: [Dist]
-dists = [rawhide, Fedora 30, Fedora 29, Fedora 28, EPEL 7, EPEL 6]
+dists = [rawhide, Fedora 31, Fedora 30, Fedora 29, EPEL 8, EPEL 7, EPEL 6]
 
 -- | The Fedora release number corresponding to current Rawhide
 rawhideRelease :: Int
-rawhideRelease = 31
+rawhideRelease = 32
 
 -- | The Fedora release corresponding to Rawhide
 rawhide :: Dist
 rawhide = Fedora rawhideRelease
 
--- | Used for Koji sidetag when needed.
-sidetag :: Dist -> Maybe String
---sidetag (Fedora n) | n == rawhideRelease = Just "ghc"
-sidetag _ = Nothing
-
--- | The Fedora release being tracked in Hackage Distro data (`rawhideRelease` - 1)
-hackageRelease :: Dist
-hackageRelease = Fedora (rawhideRelease - 1)
-
 -- | Maps `Dist` to package distgit branch
 distBranch :: Dist -> String
 distBranch (Fedora n) | n >= rawhideRelease = "master"
@@ -108,38 +96,38 @@
 
 -- | Whether dist has overrides in Bodhi
 distOverride :: Dist -> Bool
-distOverride d = d `notElem` [rawhide, Fedora 30 , EPEL 8]
-
-distTag :: Dist -> String
-distTag d = show d ++ "-" ++ fromMaybe "build" (sidetag d)
-
-distTarget  :: Dist -> String
-distTarget d = show d ++ "-" ++ fromMaybe "" (sidetag d)
+distOverride d = d `notElem` [rawhide, Fedora 32 , EPEL 9]
 
+-- | OS release major version for `Dist`
 releaseVersion :: Dist -> String
 releaseVersion (Fedora n) | n >= rawhideRelease = "rawhide"
 releaseVersion (Fedora n) = show n
 releaseVersion (EPEL n) = show n
 releaseVersion (RHEL n) = show n
 
+-- | `Dist` tag (appended to rpm package release field)
 rpmDistTag :: Dist -> String
 rpmDistTag (Fedora n) = ".fc" ++ show n
 rpmDistTag (RHEL v) = ".el" ++ (show . head . versionBranch) v
 rpmDistTag d = '.' : show d
 
+-- | Command line tool for `Dist` (eg "koji")
 kojicmd :: Dist -> String
 kojicmd (RHEL _) = "brew"
 kojicmd _ =  "koji"
 
+-- | rpkg command for `Dist` (eg "fedpkg")
 rpkg :: Dist -> String
 rpkg (RHEL _) = "rhpkg"
 rpkg _ = "fedpkg"
 
+-- | Mock configuration for `Dist` and arch
 mockConfig :: Dist -> String -> String
 mockConfig dist arch =
   distRepo dist ++ "-" ++ releaseVersion dist ++ "-" ++ arch
 
+-- | Map `Dist` to a container image
 distContainer :: Dist -> String
 distContainer (Fedora n) = "fedora:" ++ show n
 distContainer (EPEL n) = "centos:" ++ show n
-distContainer (RHEL n) = "rhel" ++ show n
+distContainer (RHEL n) = "ubi" ++ show n ++ "/ubi"
diff --git a/fedora-dists.cabal b/fedora-dists.cabal
--- a/fedora-dists.cabal
+++ b/fedora-dists.cabal
@@ -1,6 +1,6 @@
 cabal-version:       1.18
 name:                fedora-dists
-version:             1.0.1
+version:             1.1.0
 synopsis:            Library for Fedora distribution versions
 description:
             This library provides the Dist datatype and various associated
@@ -18,7 +18,7 @@
 extra-doc-files:     README.md
                    , CHANGELOG.md
 tested-with:         GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.2,
-                     GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.3
+                     GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5
 
 source-repository head
   type:                git