diff --git a/reproman/distributions/debian.py b/reproman/distributions/debian.py
index 6c9ad9b35..776aae9c2 100644
--- a/reproman/distributions/debian.py
+++ b/reproman/distributions/debian.py
@@ -51,8 +51,8 @@
 
 # TODO: flyweight/singleton ?
 # To make them hashable we need to freeze them... not sure if we are ready:
-#@attr.s(cmp=True, hash=True, frozen=True)
-@attr.s(cmp=True)
+#@attr.s(cmp=True, frozen=True)
+@attr.s
 class APTSource(SpecObject):
     """APT origin information
     """
@@ -69,7 +69,7 @@ class APTSource(SpecObject):
 _register_with_representer(APTSource)
 
 
-@attr.s(slots=True, frozen=True, cmp=False, hash=True)
+@attr.s(slots=True, frozen=True)
 class DEBPackage(Package):
     """Debian package information"""
     name = attrib(default=attr.NOTHING)
diff --git a/reproman/distributions/docker.py b/reproman/distributions/docker.py
index 9007db011..baa7e1ec1 100644
--- a/reproman/distributions/docker.py
+++ b/reproman/distributions/docker.py
@@ -23,7 +23,7 @@
 from ..utils import attrib
 
 
-@attr.s(slots=True, frozen=True, cmp=False, hash=True)
+@attr.s(slots=True, frozen=True)
 class DockerImage(Package):
     """Docker image information"""
     id = attrib(default=attr.NOTHING)
diff --git a/reproman/distributions/redhat.py b/reproman/distributions/redhat.py
index 8f7baf0c4..cec4b61c4 100644
--- a/reproman/distributions/redhat.py
+++ b/reproman/distributions/redhat.py
@@ -45,7 +45,7 @@ class RPMSource(SpecObject):
 _register_with_representer(RPMSource)
 
 
-@attr.s(slots=True, frozen=True, cmp=False, hash=True)
+@attr.s(slots=True, frozen=True)
 class RPMPackage(Package):
     """Redhat package information"""
     name = attrib(default=attr.NOTHING)
diff --git a/reproman/distributions/singularity.py b/reproman/distributions/singularity.py
index 972443cc9..c99ce49a4 100644
--- a/reproman/distributions/singularity.py
+++ b/reproman/distributions/singularity.py
@@ -26,7 +26,7 @@
 from ..utils import attrib, md5sum, chpwd
 
 
-@attr.s(slots=True, frozen=True, cmp=False, hash=True)
+@attr.s(slots=True, frozen=True)
 class SingularityImage(Package):
     """Singularity image information"""
     md5 = attrib(default=attr.NOTHING)