diff --git a/pkg/abap/aakaas/componentVersion.go b/pkg/abap/aakaas/componentVersion.go
index 9956a523d..a8696ecd4 100644
--- a/pkg/abap/aakaas/componentVersion.go
+++ b/pkg/abap/aakaas/componentVersion.go
@@ -18,7 +18,7 @@ type ComponentVersion struct {
 }
 
 func (c *ComponentVersion) ConstructComponentVersion(repo abaputils.Repository, conn abapbuild.Connector) error {
-	if err := c.constructVersionable(repo.Name, repo.VersionYAML, conn, pvQueryURL); err != nil {
+	if err := c.constructVersionable(repo.Name, repo.VersionYAML, conn, cvQueryURL); err != nil {
 		return err
 	}
 	if err := c.resolveNext(); err != nil {
@@ -32,6 +32,7 @@ func (c *ComponentVersion) CopyVersionFieldsToRepo(repo *abaputils.Repository) {
 	repo.Version = c.TechRelease
 	repo.SpLevel = c.TechSpLevel
 	repo.PatchLevel = c.TechPatchLevel
+	repo.VersionYAML = c.Version
 }
 
 func (c *ComponentVersion) Validate() error {
diff --git a/pkg/abap/aakaas/productVersion.go b/pkg/abap/aakaas/productVersion.go
index 3a5e9f75f..ce327a47b 100644
--- a/pkg/abap/aakaas/productVersion.go
+++ b/pkg/abap/aakaas/productVersion.go
@@ -31,6 +31,7 @@ func (p *ProductVersion) CopyVersionFieldsToDescriptor(desc *abaputils.AddonDesc
 	desc.AddonVersion = p.TechRelease
 	desc.AddonSpsLevel = p.TechSpLevel
 	desc.AddonPatchLevel = p.TechPatchLevel
+	desc.AddonVersionYAML = p.Version
 }
 
 func (p *ProductVersion) ValidateAndResolveVersionFields() error {
diff --git a/pkg/abap/aakaas/versionables.go b/pkg/abap/aakaas/versionables.go
index 67a781d13..9b816efef 100644
--- a/pkg/abap/aakaas/versionables.go
+++ b/pkg/abap/aakaas/versionables.go
@@ -159,6 +159,7 @@ func (v *versionable) queryVersion(filter string, orderBy string) (*versionable,
 			return &result, errors.New("Unexpected Number of CVs in result: " + fmt.Sprint(len(Versions.Wrapper.Vs)))
 		}
 	}
+	log.Entry().Infof("... looked up highest existing package in AAKaaS of the codeline: %s.%s.%s", result.TechRelease, result.TechSpLevel, result.TechPatchLevel)
 	return &result, nil
 }